projects
/
grml2usb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove default boot entry for additional isos
[grml2usb.git]
/
grml2usb
diff --git
a/grml2usb
b/grml2usb
index
909a6a6
..
dfb6ef6
100755
(executable)
--- a/
grml2usb
+++ b/
grml2usb
@@
-534,7
+534,17
@@
include additional.cfg
include options.cfg
include addons.cfg
include options.cfg
include addons.cfg
-include isoprompt.cfg
+
+label help
+ menu label S^yslinux prompt
+ config prompt.cfg
+ text help
+ Jump to old style isolinux prompt
+ featuring further information
+ regarding available boot options.
+ endtext
+
+
include hiddens.cfg
""")
include hiddens.cfg
""")
@@
-1109,7
+1119,7
@@
def copy_bootloader_files(iso_mount, target):
logo = search_file('logo.16', iso_mount)
exec_rsync(logo, syslinux_target + 'logo.16')
logo = search_file('logo.16', iso_mount)
exec_rsync(logo, syslinux_target + 'logo.16')
- for ffile in 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9', 'f10':
+ for ffile in 'f
1', 'f
2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9', 'f10':
bootsplash = search_file(ffile, iso_mount)
exec_rsync(bootsplash, syslinux_target + ffile)
bootsplash = search_file(ffile, iso_mount)
exec_rsync(bootsplash, syslinux_target + ffile)
@@
-1434,6
+1444,14
@@
def modify_filenames(grml_flavour, target, filenames):
adjust_syslinux_bootoptions(new_filename, grml_flavour)
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
def handle_syslinux_config(grml_flavour, target):
"""Main handler for generating syslinux configuration
@@
-1457,7
+1475,8
@@
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')
# 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()
initial_syslinux_config(syslinux_target)
syslinux_config_file.close()
initial_syslinux_config(syslinux_target)
@@
-1482,6
+1501,11
@@
def handle_syslinux_config(grml_flavour, target):
new_default = "%s-default.cfg" % (grml_flavour)
entry = 'include %s\n' % new_default
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)
add_entry_if_not_present("%s/defaults.cfg" % syslinux_target, entry)
add_syslinux_entry("%s/additional.cfg" % syslinux_target, grml_flavour)