X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=f4d054b4408eed21767742e9715bc4468db803c2;hp=7891339cf954ce844950c52de893ad1a68d8b6f1;hb=96d76e0666a7e58ecf7aedc4a503a3471d132be7;hpb=ad536c6777f3a634dc00288d2219d056ab18929e diff --git a/grml2usb b/grml2usb index 7891339..f4d054b 100755 --- a/grml2usb +++ b/grml2usb @@ -20,7 +20,7 @@ import fileinput import glob # global variables -PROG_VERSION = "0.9.15" +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 @@ -1117,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 @@ -1132,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 @@ -1139,26 +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 '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/') - 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 + '/boot/isolinux/' + 'addon*.cfg'): + 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/' @@ -1205,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) @@ -1466,10 +1483,10 @@ def adjust_syslinux_bootoptions(src, flavour): sys.stdout.write(line) fileinput.close() -def adjust_labels(src, flavour): +def adjust_labels(src, replacement): label_re = re.compile("^(\s*label\s*) ([a-zA-Z0-9_-]+)", re.I) for line in fileinput.input(src, inplace=1): - line = label_re.sub(r'\1 %s-\2' % flavour, line) + line = label_re.sub(replacement, line) sys.stdout.write(line) fileinput.close() @@ -1534,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) @@ -1549,8 +1567,8 @@ def handle_syslinux_config(grml_flavour, target): new_hidden = "%s_hidden.cfg" % (flavour_filename) new_hidden_file = "%s/%s" % (syslinux_target, new_hidden) os.rename(filename, new_hidden_file) - adjust_labels(new_hidden_file, flavour_filename) - adjust_syslinux_bootoptions(new_hidden_file, flavour_filename) + adjust_labels(new_hidden_file, r'\1 %s-\2' % grml_flavour) + adjust_syslinux_bootoptions(new_hidden_file, grml_flavour) entry = 'include %s\n' % new_hidden add_entry_if_not_present("%s/hiddens.cfg" % syslinux_target, entry) @@ -1561,7 +1579,16 @@ def handle_syslinux_config(grml_flavour, target): defaults_file = '%s/defaults.cfg' % syslinux_target if os.path.isfile(defaults_file): - remove_default_entry('%s/%s_default.cfg' % (syslinux_target, flavour_filename)) + new_default_with_path = "%s/%s" % (syslinux_target, new_default) + new_grml_cfg = "%s/%s_grml.cfg" % ( syslinux_target, flavour_filename) + + # remove default menu entry in menu + remove_default_entry(new_default_with_path) + + # adjust all labels for additional isos + adjust_labels(new_default_with_path, r'\1 %s' % grml_flavour) + adjust_labels(new_grml_cfg, r'\1 %s-\2' % grml_flavour) + add_entry_if_not_present("%s/defaults.cfg" % syslinux_target, entry)