X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=9e2b668a9ca41fdc6e9a1431fdd5e3db8c23d7f2;hp=34ea78af75b5dd51ba881b37884293114bef85e6;hb=8dcfa249bb0f0c4376a382e5b36fd39dd3dce256;hpb=59cfda4bf945512eb8a592b8e00d5e799c17ef5b diff --git a/grml2usb b/grml2usb index 34ea78a..9e2b668 100755 --- a/grml2usb +++ b/grml2usb @@ -17,15 +17,21 @@ from optparse import OptionParser from inspect import isroutine, isclass import datetime, logging, os, re, subprocess, sys, tempfile, time, os.path import fileinput +import glob # global variables -PROG_VERSION = "0.9.14" +PROG_VERSION = "0.9.17-pre1" MOUNTED = set() # register mountpoints TMPFILES = set() # register tmpfiles DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg GRML_FLAVOURS = set() # which flavours are being installed? global GRML_DEFAULT +def syslinux_warning(option, opt, value, parser): + sys.stderr.write("Note: the --syslinux option is deprecated as syslinux " + + "is grml2usb's default. Continuing anyway.\n") + setattr(parser.values, option.dest, True) + # cmdline parsing USAGE = "Usage: %prog [options] <[ISO[s] | /live/image]> \n\ \n\ @@ -70,7 +76,8 @@ parser.add_option("--skip-mbr", dest="skipmbr", action="store_true", help="do not install a master boot record (MBR) on the device") parser.add_option("--skip-syslinux-config", dest="skipsyslinuxconfig", action="store_true", help="skip generation of syslinux configuration files") -parser.add_option("--syslinux", dest="syslinux", action="store_true", +parser.add_option("--syslinux", dest="syslinux", action="callback", default=True, + callback=syslinux_warning, help="install syslinux bootloader (deprecated as it's the default)") parser.add_option("--syslinux-mbr", dest="syslinuxmbr", action="store_true", help="install syslinux master boot record (MBR) instead of default") @@ -649,9 +656,6 @@ def install_bootloader(device): @device: partition where bootloader should be installed to""" # by default we use grub, so install syslinux only on request - if options.syslinux: - logging.info("Note: the --syslinux option is deprecated as syslinux is grml2usb's default. Continuing anyway.") - if options.grub: if not which("grub-install"): logging.critical("Fatal: grub-install not available (please install the grub package or use the --syslinux option)") @@ -1113,6 +1117,12 @@ def copy_addons(iso_mount, target): else: exec_rsync(memtestimg, addons + 'memtest') + # gpxe.lkrn + gpxeimg = search_file('gpxe.lkrn', iso_mount) + if gpxeimg is None: + logging.warn("Warning: gpxe.lkrn not found (that's fine if you don't need it)") + else: + exec_rsync(gpxeimg, addons + 'gpxe.lkrn') def copy_bootloader_files(iso_mount, target): """copy grml's bootloader files to a given target @@ -1128,6 +1138,8 @@ def copy_bootloader_files(iso_mount, target): for ffile in ['f%d' % number for number in range(1,11) ]: bootsplash = search_file(ffile, iso_mount) + if not bootsplash: + continue exec_rsync(bootsplash, syslinux_target + ffile) # avoid the "file is read only, overwrite anyway (y/n) ?" question @@ -1135,25 +1147,35 @@ def copy_bootloader_files(iso_mount, target): if os.path.isfile(syslinux_target + 'ldlinux.sys'): os.unlink(syslinux_target + 'ldlinux.sys') - if not search_file('default.cfg', iso_mount + '/boot/isolinux/'): + bootloader_dirs = ['/boot/isolinux/', '/boot/syslinux/'] + source_dir = None + for dir in bootloader_dirs: + if glob.glob(iso_mount + dir + '*default.cfg'): + source_dir = dir + break + else: logging.critical("Fatal: file default.cfg could not be found.") logging.critical("Note: this grml2usb version requires an ISO generated by grml-live >=0.9.24 ...") logging.critical(" ... either use grml releases >=2009.10 or switch to an older grml2usb version.") logging.critical(" Please visit http://grml.org/grml2usb/#grml2usb-compat for further information.") raise - for filename in 'addons.cfg', 'default.cfg', 'distri.cfg', \ - 'grml.cfg', 'grml.png', 'hd.cfg', 'isolinux.cfg', 'isolinux.bin', \ + for expr in '*default.cfg', 'distri.cfg', \ + '*grml.cfg', 'grml.png', 'hd.cfg', 'isolinux.cfg', 'isolinux.bin', \ 'isoprompt.cfg', 'options.cfg', \ 'prompt.cfg', 'vesamenu.c32', 'vesamenu.cfg', 'grml.png': - path = search_file(filename, iso_mount + '/boot/isolinux/') - if not path: - print filename - continue - exec_rsync(path, syslinux_target + filename) + files = glob.glob(iso_mount + source_dir + expr) + for path in files: + filename = os.path.basename(path) + exec_rsync(path, syslinux_target + filename) + + # copy the addons_*.cfg file to the new syslinux directory + for filename in glob.glob(iso_mount + source_dir + 'addon*.cfg'): + exec_rsync(filename, syslinux_target) - path = search_file('hidden.cfg', iso_mount + '/boot/isolinux/') - exec_rsync(path, syslinux_target + "new_" + 'hidden.cfg') + path = search_file('hidden.cfg', iso_mount + source_dir) + if path: + exec_rsync(path, syslinux_target + "new_" + 'hidden.cfg') grub_target = target + '/boot/grub/' @@ -1200,8 +1222,8 @@ def install_iso_files(grml_flavour, iso_mount, device, target): sys.exit(1) if not options.skipaddons: - if grml_flavour.endswith('-small'): - logging.info("Note: grml-small doesn't provide any addons, not installing them therefore.") + if not search_file('addons', iso_mount): + logging.info("Could not find addons, therefore not installing.") else: copy_addons(iso_mount, target) @@ -1254,11 +1276,14 @@ def modify_grub_config(filename): if options.removeoption: regexe = [] for regex in options.removeoption: - regexe.append(re.compile(r'(.*/boot/release/.*linux26.*)(%s)(.*)' % regex)) + regexe.append(re.compile(r'%s' % regex)) + + option_re = re.compile(r'(.*/boot/release/.*linux26.*)') for line in fileinput.input(filename, inplace=1): - for regex in regexe: - line = regex.sub( r'\1 \3', line) + if regexe and option_re.search(line): + for regex in regexe: + line = regex.sub(' ', line) sys.stdout.write(line) @@ -1439,9 +1464,12 @@ def adjust_syslinux_bootoptions(src, flavour): bootopt = options.bootoptions regexe = [] + option_re = None if options.removeoption: + option_re = re.compile(r'/boot/release/.*/initrd.gz') + for regex in options.removeoption: - regexe.append(re.compile(r'(.*/boot/release/.*/initrd.gz.*)(%s)(.*)' % regex)) + regexe.append(re.compile(r'%s' % regex)) for line in fileinput.input(src, inplace=1): line = boot_re.sub(r'/boot/release/%s/\2 ' % flavour.replace('-', ''), line) @@ -1449,8 +1477,9 @@ def adjust_syslinux_bootoptions(src, flavour): line = default_re.sub(r'%s-\1' % flavour, line) line = append_re.sub(r'\1 live-media-path=/live/%s/ ' % flavour, line) line = append_re.sub(r'\1 boot=live %s ' % bootopt, line) - for regex in regexe: - line = regex.sub( r'\1 \3', line) + if option_re and option_re.search(line): + for regex in regexe: + line = regex.sub(' ', line) sys.stdout.write(line) fileinput.close() @@ -1522,7 +1551,8 @@ def handle_syslinux_config(grml_flavour, target): prompt_name.close() initial_syslinux_config(syslinux_target) - modify_filenames(grml_flavour, syslinux_target, ['grml.cfg', 'default.cfg']) + if search_file('default.cfg', syslinux_target): + modify_filenames(grml_flavour, syslinux_target, ['grml.cfg', 'default.cfg']) filename = search_file("new_hidden.cfg", syslinux_target)