:license: GPL v2 or any later version
:bugreports: http://grml.org/bugs/
-TODO
-----
-
-* implement missing options (--grub, --kernel, --initrd, --squashfs, --uninstall)
-* validate partition schema/layout: is the partition schema ok and the bootable flag set? (--validate?)
-* provide --create-partition option?
-* implement logic for storing information about copied files -> register every file in a set()
-* the last line in bootsplash (boot.msg) should mention all installed grml flavours
-* code improvements:
- - improve error handling wherever possible :)
- - use 'with open("...", "w") as f: ... f.write("...")'
- - simplify functions/code as much as possible, especially:
- Too many local variables
- Too many branches
- Too many statements
-* graphical version? any volunteers? :)
"""
from __future__ import with_statement
parser.add_option("--force", dest="force", action="store_true",
help="force any actions requiring manual interaction")
parser.add_option("--grub", dest="grub", action="store_true",
- help="install grub bootloader instead of syslinux [TODO]")
+ help="install grub bootloader instead of syslinux")
parser.add_option("--initrd", dest="initrd", action="store", type="string",
help="install specified initrd instead of the default [TODO]")
parser.add_option("--kernel", dest="kernel", action="store", type="string",
raise Exception("error executing mkfs.vfat")
-def generate_grub_config(grml_flavour):
- """Generate grub configuration for use via menu.lst
+def generate_main_grub2_config(grml_flavour, install_partition, bootoptions):
+ """Generate grub2 configuration for use via grub.cfg
+
+ TODO
@grml_flavour: name of grml flavour the configuration should be generated for"""
- # TODO
- # * what about systems using grub2 without having grub1 available?
- # * support grub2?
+
+ local_datestamp = DATESTAMP
+
+ return("""\
+## main grub2 configuration - generated by grml2usb [main config generated at: %(local_datestamp)s]
+set default=0
+set timeout=5
+
+insmod fat
+
+insmod png
+if background_image (hd0, %(install_partition)s)/boot/grub/grml.png ; then
+ set color_normal=black/black
+ set color_highlight=magenta/black
+else
+ set menu_color_normal=cyan/blue
+ set menu_color_highlight=white/blue
+fi
+
+menuentry "%(grml_flavour)s (default)" {
+ set root=(hd0,%(install_partition)s)
+ linux /boot/release/%(grml_flavour)s/linux26 apm=power-off lang=us vga=791 quiet boot=live nomce module=%(grml_flavour)s %(bootoptions)s
+ initrd /boot/release/%(grml_flavour)s/initrd.gz
+}
+
+menuentry "Memory test (memtest86+)" {
+ linux /boot/addons/memtest
+}
+
+menuentry "Grub - all in one image" {
+ linux /boot/addons/memdisk
+ initrd /boot/addons/allinone.img
+}
+
+menuentry "FreeDOS" {
+ linux /boot/addons/memdisk
+ initrd /boot/addons/balder10.imz
+}
+
+#menuentry "Operating System on first partition of first disk" {
+# set root=(hd0,1)
+# chainloader +1
+#}
+#
+#menuentry "Operating System on second partition of first disk" {
+# set root=(hd0,2)
+# chainloader +1
+#}
+#
+#menuentry "Operating System on first partition of second disk" {
+# set root=(hd1,1)
+# chainloader +1
+#}
+#menuentry "Operating System on second partition of second disk" {
+# set root=(hd1,2)
+# chainloader +1
+#}
+
+""" % {'grml_flavour': grml_flavour, 'local_datestamp': local_datestamp, 'bootoptions': bootoptions, 'install_partition': install_partition } )
+
+
+def generate_flavour_specific_grub2_config(grml_flavour, install_partition, bootoptions):
+ """Generate grub2 configuration for use via grub.cfg
+
+ TODO
+
+ @grml_flavour: name of grml flavour the configuration should be generated for"""
+
+ local_datestamp = DATESTAMP
+
+ return("""\
+# flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
+menuentry "%(grml_flavour)s" {
+ set root=(hd0,%(install_partition)s)
+ linux /boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce vga=791 quiet module=%(grml_flavour)s %(bootoptions)s
+ initrd /boot/release/%(grml_flavour)s/initrd.gz
+}
+
+# flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
+menuentry "%(grml_flavour)s2ram" {
+ set root=(hd0,%(install_partition)s)
+ linux /boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce vga=791 quiet module=%(grml_flavour)s toram=%(grml_flavour)s %(bootoptions)s
+ initrd /boot/release/%(grml_flavour)s/initrd.gz
+
+# flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
+menuentry "%(grml_flavour)s-debug" {
+ set root=(hd0,%(install_partition)s)
+ linux /boot/release/%(grml_flavour)s/linux26
+ initrd /boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live nomce vga=791 quiet module=%(grml_flavour)s debug boot=live initcall_debug%(bootoptions)s
+}
+
+# flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
+menuentry "%(grml_flavour)s-x" {
+ set root=(hd0,%(install_partition)s)
+ linux /boot/release/%(grml_flavour)s/linux26
+ initrd /boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live nomce vga=791 quiet module=%(grml_flavour)s startx=wm-ng %(bootoptions)s
+}
+
+# flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
+menuentry "%(grml_flavour)s-nofb" {
+ set root=(hd0,%(install_partition)s)
+ linux /boot/release/%(grml_flavour)s/linux26
+ initrd /boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live nomce quiet module=%(grml_flavour)s vga=normal video=ofonly %(bootoptions)s
+}
+
+# flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
+menuentry "%(grml_flavour)s-failsafe" {
+ set root=(hd0,%(install_partition)s)
+ linux /boot/release/%(grml_flavour)s/linux26
+ initrd /boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live nomce quiet module=%(grml_flavour)s vga=normal lang=us boot=live noautoconfig atapicd noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia maxcpus=1 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm %(bootoptions)s
+}
+
+# flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
+menuentry "%(grml_flavour)s-forensic" {
+ set root=(hd0,%(install_partition)s)
+ linux /boot/release/%(grml_flavour)s/linux26
+ initrd /boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live nomce vga=791 quiet module=%(grml_flavour)s nofstab noraid nolvm noautoconfig noswap raid=noautodetect %(bootoptions)s
+}
+
+# flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
+menuentry "%(grml_flavour)s-serial" {
+ set root=(hd0,%(install_partition)s)
+ linux /boot/release/%(grml_flavour)s/linux26
+ initrd /boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live nomce quiet module=%(grml_flavour)s vga=normal video=vesafb:off console=tty1 console=ttyS0,9600n8 %(bootoptions)s
+}
+
+""" % {'grml_flavour': grml_flavour, 'local_datestamp': local_datestamp, 'bootoptions': bootoptions, 'install_partition': install_partition } )
+
+
+def generate_grub1_config(grml_flavour, install_partition, bootoptions):
+ """Generate grub1 configuration for use via menu.lst
+
+ @grml_flavour: name of grml flavour the configuration should be generated for"""
+
+ local_datestamp = DATESTAMP
return("""\
# misc options:
foreground = 000000
background = FFCC33
+# root=(hd0,%(install_partition)s)
+
# define entries:
title %(grml_flavour)s - Default boot (using 1024x768 framebuffer)
kernel /boot/release/%(grml_flavour)s/linux26 apm=power-off lang=us vga=791 quiet boot=live nomce module=%(grml_flavour)s
initrd /boot/release/%(grml_flavour)s/initrd.gz
-# TODO: extend configuration :)
-""" % {'grml_flavour': grml_flavour} )
+""" % {'grml_flavour': grml_flavour, 'local_datestamp': local_datestamp, 'bootoptions': bootoptions, 'install_partition': install_partition } )
def generate_isolinux_splash(grml_flavour):
# the default option (using %(grml_flavour)s)
LABEL grml
KERNEL /boot/release/%(grml_flavour)s/linux26
-APPEND initrd=/boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live nomce quiet module=%(grml_flavour)s %(bootoptions)s
+APPEND initrd=/boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live nomce vga=791 quiet module=%(grml_flavour)s %(bootoptions)s
# memtest
LABEL memtest
KERNEL /boot/addons/memtest
-#APPEND BOOT_IMAGE=memtest
# grub
LABEL grub
# flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
LABEL %(grml_flavour)s
KERNEL /boot/release/%(grml_flavour)s/linux26
-APPEND initrd=/boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live nomce quiet module=%(grml_flavour)s %(bootoptions)s
+APPEND initrd=/boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live nomce vga=791 quiet module=%(grml_flavour)s %(bootoptions)s
# flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
LABEL %(grml_flavour)s2ram
KERNEL /boot/release/%(grml_flavour)s/linux26
-APPEND initrd=/boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live nomce quiet module=%(grml_flavour)s toram=%(grml_flavour)s %(bootoptions)s
+APPEND initrd=/boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live nomce vga=791 quiet module=%(grml_flavour)s toram=%(grml_flavour)s %(bootoptions)s
# flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
LABEL %(grml_flavour)s-debug
KERNEL /boot/release/%(grml_flavour)s/linux26
-APPEND initrd=/boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live nomce quiet module=%(grml_flavour)s debug boot=live initcall_debug%(bootoptions)s
+APPEND initrd=/boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live nomce vga=791 quiet module=%(grml_flavour)s debug boot=live initcall_debug%(bootoptions)s
# flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
LABEL %(grml_flavour)s-x
KERNEL /boot/release/%(grml_flavour)s/linux26
-APPEND initrd=/boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live nomce quiet module=%(grml_flavour)s startx=wm-ng %(bootoptions)s
+APPEND initrd=/boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live nomce vga=791 quiet module=%(grml_flavour)s startx=wm-ng %(bootoptions)s
# flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
LABEL %(grml_flavour)s-nofb
# flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
LABEL %(grml_flavour)s-forensic
KERNEL /boot/release/%(grml_flavour)s/linux26
-APPEND initrd=/boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live nomce quiet module=%(grml_flavour)s nofstab noraid nolvm noautoconfig noswap raid=noautodetect %(bootoptions)s
+APPEND initrd=/boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live nomce vga=791 quiet module=%(grml_flavour)s nofstab noraid nolvm noautoconfig noswap raid=noautodetect %(bootoptions)s
# flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s]
LABEL %(grml_flavour)s-serial
def install_grub(device):
"""Install grub on specified device.
+ @mntpoint: mountpoint of device where grub should install its files to
@device: partition where grub should be installed to"""
if options.dryrun:
- logging.info("Would execute grub-install %s now.", device)
+ logging.info("Would execute grub-install [--root-directory=mount_point] %s now.", device)
else:
- logging.critical("TODO: sorry - grub-install %s not implemented yet" % device)
+ device_mountpoint = tempfile.mkdtemp()
+ register_tmpfile(device_mountpoint)
+ try:
+ mount(device, device_mountpoint, "")
+ logging.debug("grub-install --root-directory=%s %s", device_mountpoint, device)
+ proc = subprocess.Popen(["grub-install", "--root-directory=%s" % device_mountpoint, device], stdout=file(os.devnull, "r+"))
+ proc.wait()
+ if proc.returncode != 0:
+ raise Exception("error executing grub-install")
+ except CriticalException, error:
+ logging.critical("Fatal: %s" % error)
+ cleanup()
+ sys.exit(1)
+
+ finally:
+ unmount(device_mountpoint, "")
+ os.rmdir(device_mountpoint)
+ unregister_tmpfile(device_mountpoint)
def install_syslinux(device):
proc = subprocess.Popen(["syslinux", "-d", "boot/syslinux", device])
proc.wait()
if proc.returncode != 0:
- raise Exception("error executing syslinux")
+ raise CriticalException("Error executing syslinux (either try --fat16 or --grub?)")
def install_bootloader(device):
if options.grub:
install_grub(device)
else:
- install_syslinux(device)
+ try:
+ install_syslinux(device)
+ except CriticalException, error:
+ logging.critical("Fatal: %s" % error)
+ cleanup()
+ sys.exit(1)
def install_lilo_mbr(lilo, device):
logging.critical("Execution failed:", error)
+def InstallMBR(mbrtemplate, device, partition, ismirbsdmbr=True):
+ """Installs an MBR to a device.
+
+ Retrieve the partition table from "device", install an MBR from
+ the "mbrtemplate" file, set the "partition" (0..3) active, and
+ install the result back to "device".
+
+ "device" may be the name of a file assumed to be a hard disc
+ (or USB stick) image, or something like "/dev/sdb". "partition"
+ must be a number between 0 and 3, inclusive. "mbrtemplate" must
+ be a valid MBR file of at least 440 (439 if ismirbsdmbr) bytes.
+
+ If "ismirbsdmbr", the partitions' active flags are not changed.
+ Instead, the MBR's default value is set accordingly.
+ """
+
+ if (partition < 0) or (partition > 3):
+ raise ValueError("partition must be between 0 and 3")
+
+ if ismirbsdmbr:
+ nmbrbytes = 439
+ else:
+ nmbrbytes = 440
+
+ tmpf = tempfile.NamedTemporaryFile()
+
+ logging.debug("executing: dd if='%s' of='%s' bs=512 count=1" % (device, tmpf.name))
+ proc = subprocess.Popen(["dd", "if=%s" % device, "of=%s" % tmpf.name, "bs=512", "count=1"], stderr=file(os.devnull, "r+"))
+ proc.wait()
+ if proc.returncode != 0:
+ raise Exception("error executing dd (first run)")
+ # os.system("dd if='%s' of='%s' bs=512 count=1" % (device, tmpf.name))
+
+ logging.debug("executing: dd if=%s of=%s bs=%s count=1 conv=notrunc" % (mbrtemplate, tmpf.name, nmbrbytes))
+ proc = subprocess.Popen(["dd", "if=%s" % mbrtemplate, "of=%s" % tmpf.name, "bs=%s" % nmbrbytes, "count=1", "conv=notrunc"], stderr=file(os.devnull, "r+"))
+ proc.wait()
+ if proc.returncode != 0:
+ raise Exception("error executing dd (second run)")
+ # os.system("dd if='%s' of='%s' bs=%d count=1 conv=notrunc" % (mbrtemplate, tmpf.name, nmbrbytes))
+
+ mbrcode = tmpf.file.read(512)
+ if len(mbrcode) < 512:
+ raise EOFError("MBR size (%d) < 512" % len(mbrcode))
+
+ if ismirbsdmbr:
+ mbrcode = mbrcode[0:439] + chr(partition) + \
+ mbrcode[440:510] + "\x55\xAA"
+ else:
+ actives = ["\x00", "\x00", "\x00", "\x00"]
+ actives[partition] = "\x80"
+ mbrcode = mbrcode[0:446] + actives[0] + \
+ mbrcode[447:462] + actives[1] + \
+ mbrcode[463:478] + actives[2] + \
+ mbrcode[479:494] + actives[3] + \
+ mbrcode[495:510] + "\x55\xAA"
+
+ tmpf.file.seek(0)
+ tmpf.file.truncate()
+ tmpf.file.write(mbrcode)
+ tmpf.file.close()
+
+ #os.system("dd if='%s' of='%s' bs=512 count=1 conv=notrunc" % (tmpf.name, device))
+ logging.debug("executing: dd if='%s' of='%s' bs=512 count=1 conv=notrunc" % (tmpf.name, "/tmp/mbr"))
+ proc = subprocess.Popen(["dd", "if=%s" % tmpf.name, "of=%s" % "/tmp/mbr", "bs=512", "count=1", "conv=notrunc"], stderr=file(os.devnull, "r+"))
+ proc.wait()
+ if proc.returncode != 0:
+ raise Exception("error executing dd (third run)")
+ # os.system("dd if='%s' of='%s' bs=512 count=1 conv=notrunc" % (tmpf.name, "/tmp/mbr"))
+ del tmpf
+
def install_mbr(device):
"""Install a default master boot record on given device
@target: directory where the ISO should be mounted to
@options: mount specific options"""
- # notice: options.dryrun does not work here, as we have to
+ # note: options.dryrun does not work here, as we have to
# locate files and identify the grml flavour
logging.debug("mount %s %s %s" % (mount_options, source, target))
proc = subprocess.Popen(["mount"] + list(mount_options) + [source, target])
if udev_info.returncode == 2:
raise CriticalException("Failed to read device %s"
- "(wrong UID/permissions or device not present?)" % partition)
+ " (wrong UID/permissions or device not present?)" % partition)
if filesystem != "vfat":
raise CriticalException("Device %s does not contain a FAT16 partition." % partition)
proc = subprocess.Popen(["install", "--mode=664", balderimg, addons + 'balder10.imz'])
proc.wait()
- # memtest86+ image
+ # memdisk image
memdiskimg = search_file('memdisk', iso_mount)
if memdiskimg is None:
logging.warn("Warning: memdisk not found - can not install it")
proc = subprocess.Popen(["install", "--mode=664", memdiskimg, addons + 'memdisk'])
proc.wait()
+ # memtest86+ image
+ memtestimg = search_file('memtest', iso_mount)
+ if memtestimg is None:
+ logging.warn("Warning: memtest not found - can not install it")
+ else:
+ logging.debug("cp %s %s" % (memtestimg, addons + '/memtest'))
+ proc = subprocess.Popen(["install", "--mode=664", memtestimg, addons + 'memtest'])
+ proc.wait()
+
def copy_bootloader_files(iso_mount, target):
""""TODO"""
proc.wait()
-def install_iso_files(grml_flavour, iso_mount, target):
+def install_iso_files(grml_flavour, iso_mount, device, target):
"""Copy files from ISO on given target"""
# TODO
# * make sure grml_flavour, iso_mount, target are set when the function is called, otherwise raise exception
# * provide alternative search_file() if file information is stored in a config.ini file?
# * catch "install: .. No space left on device" & CO
- # * abstract copy logic to make the code shorter and get rid of spaghettis ;)
if options.dryrun:
logging.info("Would copy files to %s", iso_mount)
copy_bootloader_files(iso_mount, target)
if not options.dryrun:
- handle_bootloader_config(grml_flavour, target) # FIXME
+ handle_bootloader_config(grml_flavour, device, target)
# make sure we sync filesystems before returning
proc = subprocess.Popen(["sync"])
return grml_flavour
-
-def handle_bootloader_config(grml_flavour, target):
- """TODO"""
+def handle_grub_config(grml_flavour, device, target):
+ """ TODO """
logging.debug("Generating grub configuration")
#with open("...", "w") as f:
grub_target = target + '/boot/grub/'
# should be present via copy_bootloader_files(), but make sure it exists:
execute(mkdir, grub_target)
- grub_config_file = open(grub_target + 'menu.lst', 'w')
- grub_config_file.write(generate_grub_config(grml_flavour))
- grub_config_file.close()
+ # we have to adjust root() inside grub configuration
+ if device[-1:].isdigit():
+ install_partition = device[-1:]
+
+ # grub1 config
+ #logging.debug("Creating grub1 configuration file")
+ #grub_config_file = open(grub_target + 'menu.lst', 'w')
+ #grub_config_file.write(generate_grub1_config(grml_flavour, install_partition, options.bootoptions))
+ #grub_config_file.close()
+ # TODO => generate_main_grub1_config() && generate_flavour_specific_grub1_config()
+
+ # grub2 config
+ grub2_cfg = grub_target + 'grub.cfg'
+ logging.debug("Creating grub2 configuration file")
+
+ # install main configuration only *once*, no matter how many ISOs we have:
+ if os.path.isfile(grub2_cfg):
+ string = open(grub2_cfg).readline()
+ main_identifier = re.compile(".*main config generated at: %s.*" % re.escape(str(DATESTAMP)))
+ if not re.match(main_identifier, string):
+ grub2_config_file = open(grub2_cfg, 'w')
+ logging.info("Note: grml flavour %s is being installed as the default booting system." % grml_flavour)
+ grub2_config_file.write(generate_main_grub2_config(grml_flavour, install_partition, options.bootoptions))
+ grub2_config_file.close()
+ else:
+ grub2_config_file = open(grub2_cfg, 'w')
+ grub2_config_file.write(generate_main_grub2_config(grml_flavour, install_partition, options.bootoptions))
+ grub2_config_file.close()
+
+ grub_flavour_config = True
+ if os.path.isfile(grub2_cfg):
+ string = open(grub2_cfg).readlines()
+ logging.info("Note: you can boot flavour %s using '%s' on the commandline." % (grml_flavour, grml_flavour))
+ flavour = re.compile("grml2usb for %s: %s" % (re.escape(grml_flavour), re.escape(str(DATESTAMP))))
+ for line in string:
+ if flavour.match(line):
+ grub_flavour_config = False
+
+ if grub_flavour_config:
+ grub2_config_file = open(grub2_cfg, 'a')
+ grub2_config_file.write(generate_flavour_specific_grub2_config(grml_flavour, install_partition, options.bootoptions))
+ grub2_config_file.close( )
+
+
+def handle_syslinux_config(grml_flavour, target):
+ """ TODO
+ """
logging.info("Generating syslinux configuration")
syslinux_target = target + '/boot/syslinux/'
main_identifier = re.compile(".*main config generated at: %s.*" % re.escape(str(DATESTAMP)))
if not re.match(main_identifier, string):
syslinux_config_file = open(syslinux_cfg, 'w')
- logging.info("Notice: grml flavour %s is being installed as the default booting system." % grml_flavour)
+ logging.info("Note: grml flavour %s is being installed as the default booting system." % grml_flavour)
syslinux_config_file.write(generate_main_syslinux_config(grml_flavour, options.bootoptions))
syslinux_config_file.close()
else:
# install flavour specific configuration only *once* as well
# kind of ugly - I'm pretty sure this could be smoother...
- flavour_config = True
+ syslinux_flavour_config = True
if os.path.isfile(syslinux_cfg):
string = open(syslinux_cfg).readlines()
- logging.info("Notice: you can boot flavour %s using '%s' on the commandline." % (grml_flavour, grml_flavour))
+ logging.info("Note: you can boot flavour %s using '%s' on the commandline." % (grml_flavour, grml_flavour))
flavour = re.compile("grml2usb for %s: %s" % (re.escape(grml_flavour), re.escape(str(DATESTAMP))))
for line in string:
if flavour.match(line):
- flavour_config = False
+ syslinux_flavour_config = False
- if flavour_config:
+ if syslinux_flavour_config:
syslinux_config_file = open(syslinux_cfg, 'a')
syslinux_config_file.write(generate_flavour_specific_syslinux_config(grml_flavour, options.bootoptions))
syslinux_config_file.close( )
isolinux_splash.close( )
+def handle_bootloader_config(grml_flavour, device, target):
+ """TODO"""
+
+ if options.grub:
+ handle_grub_config(grml_flavour, device, target)
+ else:
+ handle_syslinux_config(grml_flavour, target)
+
+
def handle_iso(iso, device):
"""Main logic for mounting ISOs and copying files.
except CriticalException, error:
logging.critical("Fatal: %s" % error)
cleanup()
+ sys.exit(1)
try:
grml_flavour = identify_grml_flavour(iso_mountpoint)
logging.info("Identified grml flavour \"%s\"." % grml_flavour)
- install_iso_files(grml_flavour, iso_mountpoint, device_mountpoint)
+ install_iso_files(grml_flavour, iso_mountpoint, device, device_mountpoint)
except TypeError:
logging.critical("Fatal: a critical error happend during execution (not a grml ISO?), giving up")
sys.exit(1)
if not options.skipmbr:
if device[-1:].isdigit():
mbr_device = re.match(r'(.*?)\d*$', device).group(1)
+ partition_number = int(device[-1:]) - 1
try:
- install_mbr(mbr_device)
+ # install_mbr(mbr_device)
+ InstallMBR('/usr/share/grml2usb/mbr/mbrmgr', mbr_device, partition_number, True)
except IOError, error:
logging.critical("Execution failed: %s", error)
sys.exit(1)
else:
sys.exit(1)
- # format partition:
- if options.fat16:
- mkfs_fat16(device)
-
def handle_compat_warning(device):
"""TODO"""
device = args[len(args) - 1]
isos = args[0:len(args) - 1]
+ if device[-1:].isdigit():
+ if int(device[-1:]) > 4:
+ logging.critical("Fatal: installation on partition number >4 not supported. (As the BIOS won't support it.)")
+ sys.exit(1)
+ else:
+ logging.critical("Fatal: installation on raw device not supported. (As the BIOS won't support it.)")
+ sys.exit(1)
+
# provide upgrade path
handle_compat_warning(device)
projects / grml2usb.git / blobdiff