X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=c63151e7f42afd555b857638e38a16f0a027dc8e;hp=ded938269a80e8daafdf0951da92427ad1690a79;hb=a87d43a2bd19085a3e4e9baf56b1db6920349c1c;hpb=5b8c1e9fd23ec3ceaa27e42016e4a3e40a15bec3 diff --git a/grml2usb b/grml2usb index ded9382..c63151e 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.13" +PROG_VERSION = "0.9.14" 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("\nNote: 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\ @@ -60,6 +66,8 @@ parser.add_option("--mbr-menu", dest="mbrmenu", action="store_true", help="enable interactive boot menu in MBR") parser.add_option("--quiet", dest="quiet", action="store_true", help="do not output anything but just errors on console") +parser.add_option("--remove-bootoption", dest="removeoption", action="append", + help="regex for removing existing bootoptions") parser.add_option("--skip-addons", dest="skipaddons", action="store_true", help="do not install /boot/addons/ files") parser.add_option("--skip-grub-config", dest="skipgrubconfig", action="store_true", @@ -68,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") @@ -647,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)") @@ -1140,16 +1146,17 @@ def copy_bootloader_files(iso_mount, target): logging.critical(" Please visit http://grml.org/grml2usb/#grml2usb-compat for further information.") raise - for filename in 'addons.cfg', 'default.cfg', 'distri.cfg', \ + for filename 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) + # copy the addons_*.cfg file to the new syslinux directory + for filename in glob.glob(iso_mount + '/boot/isolinux/' + 'addon*.cfg'): + exec_rsync(filename, syslinux_target) + path = search_file('hidden.cfg', iso_mount + '/boot/isolinux/') exec_rsync(path, syslinux_target + "new_" + 'hidden.cfg') @@ -1248,6 +1255,23 @@ def identify_grml_flavour(mountpath): return grml_flavour +def modify_grub_config(filename): + if options.removeoption: + regexe = [] + for regex in options.removeoption: + regexe.append(re.compile(r'%s' % regex)) + + option_re = re.compile(r'(.*/boot/release/.*linux26.*)') + + for line in fileinput.input(filename, inplace=1): + if regexe and option_re.search(line): + for regex in regexe: + line = regex.sub(' ', line) + + sys.stdout.write(line) + + fileinput.close() + def handle_grub1_config(grml_flavour, install_partition, grub_target, bootopt): """Main handler for generating grub1 configuration @@ -1286,6 +1310,8 @@ def handle_grub1_config(grml_flavour, install_partition, grub_target, bootopt): grub1_config_file.write(generate_flavour_specific_grub1_config(grml_flavour, install_partition, bootopt)) grub1_config_file.close() + modify_grub_config(grub1_cfg) + # make sure grub.conf isn't a symlink but a plain file instead, # otherwise it will break on FAT16 filesystems # this works around grub-install of (at least) Fedora 10 @@ -1343,6 +1369,8 @@ def handle_grub2_config(grml_flavour, grub_target, bootopt): grub2_config_file.write(generate_flavour_specific_grub2_config(grml_flavour, bootopt)) grub2_config_file.close() + modify_grub_config(grub2_cfg) + def handle_grub_config(grml_flavour, device, target): """Main handler for generating grub (v1 and v2) configuration @@ -1418,12 +1446,23 @@ def adjust_syslinux_bootoptions(src, flavour): else: 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'%s' % regex)) + for line in fileinput.input(src, inplace=1): line = boot_re.sub(r'/boot/release/%s/\2 ' % flavour.replace('-', ''), line) # line = flavour_re.sub(r'\1 %s-\2' % flavour, line) 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) + if option_re and option_re.search(line): + for regex in regexe: + line = regex.sub(' ', line) sys.stdout.write(line) fileinput.close() @@ -1863,6 +1902,7 @@ def main(): # finally be politely :) logging.info("Finished execution of grml2usb (%s). Have fun with your grml system.", PROG_VERSION) + if __name__ == "__main__": try: main()