X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=grml2usb;h=023e036c8e2261c1af2baec58ece74a4ca1bbec2;hb=fc3de835f1fb3735b9e2f084311b36cf35639dd0;hp=df7326dcd40449a00828fe02236c2a899ba42e74;hpb=0a965db0cc8c8d0842b4aeb0c1a081435615eaa8;p=grml2usb.git

diff --git a/grml2usb b/grml2usb
index df7326d..023e036 100755
--- a/grml2usb
+++ b/grml2usb
@@ -536,7 +536,7 @@ include options.cfg
 include addons.cfg
 
 label help
-  menu label S^yslinux prompt
+  include promptname.cfg
   config prompt.cfg
   text help
                                         Jump to old style isolinux prompt
@@ -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
 
@@ -1467,9 +1475,14 @@ def handle_syslinux_config(grml_flavour, target):
     # install main configuration only *once*, no matter how many ISOs we have:
     syslinux_flavour_is_default = False
     syslinux_config_file = open(syslinux_cfg, 'w')
-    syslinux_config_file.write("include vesamenu.cfg")
+    syslinux_config_file.write("TIMEOUT 300\n")
+    syslinux_config_file.write("include vesamenu.cfg\n")
     syslinux_config_file.close()
 
+    prompt_name = open(syslinux_target + 'promptname.cfg', 'w')
+    prompt_name.write('menu label S^yslinux prompt\n')
+    prompt_name.close()
+
     initial_syslinux_config(syslinux_target)
     modify_filenames(grml_flavour, syslinux_target, ['grml.cfg', 'default.cfg'])
 
@@ -1492,6 +1505,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)