From: Ulrich Dangel <uli@spamt.net>
Date: Tue, 20 Oct 2009 19:29:07 +0000 (+0200)
Subject: remove default boot entry for additional isos
X-Git-Tag: v0.9.13~8
X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=commitdiff_plain;h=02cf19b0eb01eea3e05ab4139d04e14dfc0d9e8c

remove default boot entry for additional isos
---

diff --git a/grml2usb b/grml2usb
index 507befd..dfb6ef6 100755
--- a/grml2usb
+++ b/grml2usb
@@ -1444,6 +1444,14 @@ def modify_filenames(grml_flavour, target, filenames):
         adjust_syslinux_bootoptions(new_filename, grml_flavour)
 
 
+def remove_default_entry(filename):
+    default_re = re.compile("^(\s*menu\s*default\s*)$", re.I)
+    for line in fileinput.input(filename, inplace=1):
+        if default_re.match(line): continue
+        print line
+    fileinput.close()
+
+
 def handle_syslinux_config(grml_flavour, target):
     """Main handler for generating syslinux configuration
 
@@ -1493,6 +1501,11 @@ def handle_syslinux_config(grml_flavour, target):
 
     new_default = "%s-default.cfg" % (grml_flavour)
     entry = 'include %s\n' % new_default
+    defaults_file = '%s/defaults.cfg' % syslinux_target
+
+    if os.path.isfile(defaults_file):
+        remove_default_entry('%s/%s-default.cfg' % (syslinux_target, grml_flavour))
+
     add_entry_if_not_present("%s/defaults.cfg" % syslinux_target, entry)
 
     add_syslinux_entry("%s/additional.cfg" % syslinux_target, grml_flavour)