import fileinput
# global variables
-PROG_VERSION = "0.9.13-pre1"
+PROG_VERSION = "0.9.13"
MOUNTED = set() # register mountpoints
TMPFILES = set() # register tmpfiles
DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg
menu disable
include additional.cfg
+menu separator
include options.cfg
include addons.cfg
+
+label help
+ include promptname.cfg
+ config prompt.cfg
+ text help
+ Jump to old style isolinux prompt
+ featuring further information
+ regarding available boot options.
+ endtext
+
+
include hiddens.cfg
""")
return("""\
menu begin grml %(grml_flavour)s
- menu title %(grml_flavour)s
+ menu title %(display_name)s
label mainmenu
menu label ^Back to main menu...
menu exit
menu separator
# include config for boot parameters from disk
- include %(grml_flavour)s-grml.cfg
+ include %(grml_flavour)s_grml.cfg
menu hide
menu end
-""" % {'grml_flavour': grml_flavour } )
+""" % {'grml_flavour': grml_flavour, 'display_name' : grml_flavour.replace('_', '-') } )
def install_grub(device):
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%d' % number for number in range(1,11) ]:
bootsplash = search_file(ffile, iso_mount)
exec_rsync(bootsplash, syslinux_target + ffile)
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 'addons.cfg', 'default.cfg', 'distri.cfg', \
- 'grml.cfg', 'grml.png', 'hd.cfg', 'isoprompt.cfg', 'options.cfg', \
- 'vesamenu.c32', 'vesamenu.cfg', 'grml.png':
+ '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/')
+ if not path:
+ print filename
+ continue
exec_rsync(path, syslinux_target + filename)
path = search_file('hidden.cfg', iso_mount + '/boot/isolinux/')
- exec_rsync(path, syslinux_target + "new-" + 'hidden.cfg')
+ exec_rsync(path, syslinux_target + "new_" + 'hidden.cfg')
grub_target = target + '/boot/grub/'
def add_syslinux_entry(filename, grml_flavour):
- entry_filename = "option-%s.cfg" % grml_flavour
+ entry_filename = "option_%s.cfg" % grml_flavour
entry = "include %s\n" % entry_filename
add_entry_if_not_present(filename, entry)
data.close()
def modify_filenames(grml_flavour, target, filenames):
+ grml_flavour = grml_flavour.replace('-', '_')
for filename in filenames:
old_filename = "%s/%s" % (target, filename)
- new_filename = "%s/%s-%s" % (target, grml_flavour, filename)
+ new_filename = "%s/%s_%s" % (target, grml_flavour, filename)
os.rename(old_filename, new_filename)
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
+ sys.stdout.write(line)
+ fileinput.close()
+
+
def handle_syslinux_config(grml_flavour, target):
"""Main handler for generating syslinux configuration
# 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'])
- filename = search_file("new-hidden.cfg", syslinux_target)
+ filename = search_file("new_hidden.cfg", syslinux_target)
+
+
+ flavour_filename = grml_flavour.replace('-', '_')
# process hidden file
if not search_file("hidden.cfg", syslinux_target):
new_hidden = syslinux_target + "hidden.cfg"
os.rename(filename, new_hidden)
adjust_syslinux_bootoptions(new_hidden, grml_flavour)
else:
- new_hidden = "%s-hidden.cfg" % (grml_flavour)
+ 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, grml_flavour)
- adjust_syslinux_bootoptions(new_hidden_file, grml_flavour)
+ adjust_labels(new_hidden_file, flavour_filename)
+ adjust_syslinux_bootoptions(new_hidden_file, flavour_filename)
entry = 'include %s\n' % new_hidden
add_entry_if_not_present("%s/hiddens.cfg" % syslinux_target, entry)
- new_default = "%s-default.cfg" % (grml_flavour)
+ new_default = "%s_default.cfg" % (flavour_filename)
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, flavour_filename))
+
add_entry_if_not_present("%s/defaults.cfg" % syslinux_target, entry)
- add_syslinux_entry("%s/additional.cfg" % syslinux_target, grml_flavour)
+ add_syslinux_entry("%s/additional.cfg" % syslinux_target, flavour_filename)
def handle_bootloader_config(grml_flavour, device, target):