from inspect import isroutine, isclass
import datetime, logging, os, re, subprocess, sys, tempfile, time, os.path
import fileinput
+import glob
# global variables
-PROG_VERSION = "0.9.13-pre1"
+PROG_VERSION = "0.9.14"
MOUNTED = set() # register mountpoints
TMPFILES = set() # register tmpfiles
DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg
help="enable interactive boot menu in MBR")
parser.add_option("--quiet", dest="quiet", action="store_true",
help="do not output anything but just errors on console")
+parser.add_option("--remove-bootoption", dest="removeoption", action="append",
+ help="regex for removing existing bootoptions")
parser.add_option("--skip-addons", dest="skipaddons", action="store_true",
help="do not install /boot/addons/ files")
parser.add_option("--skip-grub-config", dest="skipgrubconfig", action="store_true",
menuentry "%(grml_flavour)s (default)" {
set gfxpayload=1024x768x16,1024x768
- linux /boot/release/%(grml_flavour)s/linux26 apm=power-off quiet boot=live nomce live-media-path=/live/%(grml_flavour)s/ %(bootoptions)s
- initrd /boot/release/%(grml_flavour)s/initrd.gz
+ linux /boot/release/%(flavour_filename)s/linux26 apm=power-off quiet boot=live nomce live-media-path=/live/%(grml_flavour)s/ %(bootoptions)s
+ initrd /boot/release/%(flavour_filename)s/initrd.gz
}
menuentry "Memory test (memtest86+)" {
}
""" % {'grml_flavour': grml_flavour, 'local_datestamp': local_datestamp,
+ 'flavour_filename': grml_flavour.replace('-', ''),
'bootoptions': bootoptions } )
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
menuentry "%(grml_flavour)s - boot in default mode" {
set gfxpayload=1024x768x16,1024x768
- linux /boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ %(bootoptions)s
- initrd /boot/release/%(grml_flavour)s/initrd.gz
+ linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ %(bootoptions)s
+ initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
menuentry "%(grml_flavour)s-persistent - enable persistency feature" {
set gfxpayload=1024x768x16,1024x768
- linux /boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet persistent live-media-path=/live/%(grml_flavour)s/ %(bootoptions)s
- initrd /boot/release/%(grml_flavour)s/initrd.gz
+ linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet persistent live-media-path=/live/%(grml_flavour)s/ %(bootoptions)s
+ initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
menuentry "%(grml_flavour)s2ram - copy compressed grml file to RAM" {
set gfxpayload=1024x768x16,1024x768
- linux /boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ toram=%(grml_flavour)s.squashfs %(bootoptions)s
- initrd /boot/release/%(grml_flavour)s/initrd.gz
+ linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ toram=%(grml_flavour)s.squashfs %(bootoptions)s
+ initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
menuentry "%(grml_flavour)s-debug - enable debugging options" {
set gfxpayload=1024x768x16,1024x768
- linux /boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ debug initcall_debug%(bootoptions)s
- initrd /boot/release/%(grml_flavour)s/initrd.gz
+ linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ debug initcall_debug%(bootoptions)s
+ initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
menuentry "%(grml_flavour)s-x - start X Window System" {
set gfxpayload=1024x768x16,1024x768
- linux /boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ startx=wm-ng %(bootoptions)s
- initrd /boot/release/%(grml_flavour)s/initrd.gz
+ linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ startx=wm-ng %(bootoptions)s
+ initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
menuentry "%(grml_flavour)s-nofb - disable framebuffer" {
- linux /boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ vga=normal video=ofonly %(bootoptions)s
- initrd /boot/release/%(grml_flavour)s/initrd.gz
+ linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ vga=normal video=ofonly %(bootoptions)s
+ initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
menuentry "%(grml_flavour)s-failsafe - disable hardware detection" {
- linux /boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ vga=normal noautoconfig atapicd noapic noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia nosmp maxcpus=0 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm noresume selinux=0 edd=off pci=nomsi %(bootoptions)s
- initrd /boot/release/%(grml_flavour)s/initrd.gz
+ linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ vga=normal noautoconfig atapicd noapic noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia nosmp maxcpus=0 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm noresume selinux=0 edd=off pci=nomsi %(bootoptions)s
+ initrd /boot/release/%(flavour_filename)s/initrd.gz
}
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
menuentry "%(grml_flavour)s-forensic - do not touch harddisks during hw recognition" {
set gfxpayload=1024x768x16,1024x768
- linux /boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ nofstab noraid nolvm noautoconfig noswap raid=noautodetect forensic readonly %(bootoptions)s
- initrd /boot/release/%(grml_flavour)s/initrd.gz
+ linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ nofstab noraid nolvm noautoconfig noswap raid=noautodetect forensic readonly %(bootoptions)s
+ initrd /boot/release/%(flavour_filename)s/initrd.gz
}
""" % {'grml_flavour': grml_flavour, 'local_datestamp': local_datestamp,
+ 'flavour_filename': grml_flavour.replace('-', ''),
'bootoptions': bootoptions } )
return("""\
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
title %(grml_flavour)s
-kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce vga=791 quiet live-media-path=/live/%(grml_flavour)s/ %(bootoptions)s
-initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz
+kernel (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce vga=791 quiet live-media-path=/live/%(grml_flavour)s/ %(bootoptions)s
+initrd (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/initrd.gz
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
title %(grml_flavour)s-persistent
-kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce vga=791 quiet persistent live-media-path=/live/%(grml_flavour)s/ %(bootoptions)s
-initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz
+kernel (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce vga=791 quiet persistent live-media-path=/live/%(grml_flavour)s/ %(bootoptions)s
+initrd (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/initrd.gz
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
title %(grml_flavour)s2ram
-kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce vga=791 quiet live-media-path=/live/%(grml_flavour)s/ toram=%(grml_flavour)s.squashfs %(bootoptions)s
-initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz
+kernel (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce vga=791 quiet live-media-path=/live/%(grml_flavour)s/ toram=%(grml_flavour)s.squashfs %(bootoptions)s
+initrd (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/initrd.gz
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
title %(grml_flavour)s-debug
-kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce vga=791 quiet live-media-path=/live/%(grml_flavour)s/ debug initcall_debug%(bootoptions)s
-initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz
+kernel (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce vga=791 quiet live-media-path=/live/%(grml_flavour)s/ debug initcall_debug%(bootoptions)s
+initrd (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/initrd.gz
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
title %(grml_flavour)s-x
-kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce vga=791 quiet live-media-path=/live/%(grml_flavour)s/ startx=wm-ng %(bootoptions)s
-initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz
+kernel (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce vga=791 quiet live-media-path=/live/%(grml_flavour)s/ startx=wm-ng %(bootoptions)s
+initrd (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/initrd.gz
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
title %(grml_flavour)s-nofb
-kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ vga=normal video=ofonly %(bootoptions)s
-initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz
+kernel (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ vga=normal video=ofonly %(bootoptions)s
+initrd (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/initrd.gz
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
title %(grml_flavour)s-failsafe
-kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ vga=normal noautoconfig atapicd noapic noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia nosmp maxcpus=0 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm noresume selinux=0 edd=off pci=nomsi %(bootoptions)s
-initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz
+kernel (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ vga=normal noautoconfig atapicd noapic noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia nosmp maxcpus=0 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm noresume selinux=0 edd=off pci=nomsi %(bootoptions)s
+initrd (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/initrd.gz
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
title %(grml_flavour)s-forensic
-kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce vga=791 quiet live-media-path=/live/%(grml_flavour)s/ nofstab noraid nolvm noautoconfig noswap raid=noautodetect forensic readonly %(bootoptions)s
-initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz
+kernel (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce vga=791 quiet live-media-path=/live/%(grml_flavour)s/ nofstab noraid nolvm noautoconfig noswap raid=noautodetect forensic readonly %(bootoptions)s
+initrd (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/initrd.gz
## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
title %(grml_flavour)s-serial
-kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ vga=normal video=vesafb:off console=tty1 console=ttyS0,9600n8 %(bootoptions)s
-initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz
+kernel (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ vga=normal video=vesafb:off console=tty1 console=ttyS0,9600n8 %(bootoptions)s
+initrd (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/initrd.gz
""" % {'grml_flavour': grml_flavour, 'local_datestamp': local_datestamp,
+ 'flavour_filename': grml_flavour.replace('-', ''),
'bootoptions': bootoptions, 'install_partition': install_partition } )
# define entries:
title %(grml_flavour)s - Default boot (using 1024x768 framebuffer)
-kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off vga=791 quiet boot=live nomce live-media-path=/live/%(grml_flavour)s/ %(bootoptions)s
-initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz
+kernel (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/linux26 apm=power-off vga=791 quiet boot=live nomce live-media-path=/live/%(grml_flavour)s/ %(bootoptions)s
+initrd (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/initrd.gz
title Memory test (memtest86+)
kernel (hd0,%(install_partition)s)/boot/addons/memtest
kernel (hd0,%(install_partition)s)/boot/addons/bsd4grml/ldbsd.com
""" % {'grml_flavour': grml_flavour, 'local_datestamp': local_datestamp,
+ 'flavour_filename': grml_flavour.replace('-', ''),
'bootoptions': bootoptions, 'install_partition': install_partition } )
menu disable
include additional.cfg
+menu separator
include options.cfg
include addons.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):
else:
exec_rsync(filesystem_module, squashfs_target + 'filesystem.module')
- release_target = target + '/boot/release/' + grml_flavour
+ release_target = target + '/boot/release/' + grml_flavour.replace('-', '')
execute(mkdir, release_target)
kernel = search_file('linux26', iso_mount)
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', \
+ '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/')
exec_rsync(path, syslinux_target + filename)
+ # copy the addons_*.cfg file to the new syslinux directory
+ for filename in glob.glob(iso_mount + '/boot/isolinux/' + 'addon_*.cfg'):
+ exec_rsync(filename, syslinux_target)
+
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/'
return grml_flavour
+def modify_grub_config(filename):
+ if options.removeoption:
+ regexe = []
+ for regex in options.removeoption:
+ regexe.append(re.compile(r'%s' % regex))
+
+ option_re = re.compile(r'(.*/boot/release/.*linux26.*)')
+
+ for line in fileinput.input(filename, inplace=1):
+ if regexe and option_re.search(line):
+ for regex in regexe:
+ line = regex.sub(' ', line)
+
+ sys.stdout.write(line)
+
+ fileinput.close()
+
def handle_grub1_config(grml_flavour, install_partition, grub_target, bootopt):
"""Main handler for generating grub1 configuration
grub1_config_file.write(generate_flavour_specific_grub1_config(grml_flavour, install_partition, bootopt))
grub1_config_file.close()
+ modify_grub_config(grub1_cfg)
+
# make sure grub.conf isn't a symlink but a plain file instead,
# otherwise it will break on FAT16 filesystems
# this works around grub-install of (at least) Fedora 10
grub2_config_file.write(generate_flavour_specific_grub2_config(grml_flavour, bootopt))
grub2_config_file.close()
+ modify_grub_config(grub2_cfg)
+
def handle_grub_config(grml_flavour, device, target):
"""Main handler for generating grub (v1 and v2) configuration
else:
bootopt = options.bootoptions
+ regexe = []
+ option_re = None
+ if options.removeoption:
+ option_re = re.compile(r'/boot/release/.*/initrd.gz')
+
+ for regex in options.removeoption:
+ regexe.append(re.compile(r'%s' % regex))
+
for line in fileinput.input(src, inplace=1):
- line = boot_re.sub(r'/boot/release/%s/\2 ' % flavour, line)
+ line = boot_re.sub(r'/boot/release/%s/\2 ' % flavour.replace('-', ''), line)
# line = flavour_re.sub(r'\1 %s-\2' % flavour, line)
line = default_re.sub(r'%s-\1' % flavour, line)
line = append_re.sub(r'\1 live-media-path=/live/%s/ ' % flavour, line)
line = append_re.sub(r'\1 boot=live %s ' % bootopt, line)
+ if option_re and option_re.search(line):
+ for regex in regexe:
+ line = regex.sub(' ', line)
sys.stdout.write(line)
fileinput.close()
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_filename = 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_filename, filename)
os.rename(old_filename, new_filename)
adjust_syslinux_bootoptions(new_filename, grml_flavour)
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, grml_flavour))
+ 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):
# finally be politely :)
logging.info("Finished execution of grml2usb (%s). Have fun with your grml system.", PROG_VERSION)
+
if __name__ == "__main__":
try:
main()