From 96d76e0666a7e58ecf7aedc4a503a3471d132be7 Mon Sep 17 00:00:00 2001 From: Ulrich Dangel Date: Wed, 28 Oct 2009 19:53:34 +0100 Subject: [PATCH] Adjust labels in grml.cfg and default.cfg if necessary. --- grml2usb | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/grml2usb b/grml2usb index 9e2b668..f4d054b 100755 --- a/grml2usb +++ b/grml2usb @@ -1483,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() @@ -1567,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) @@ -1579,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) -- 2.1.4