X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=42362d6a879039f5a14762d6d571627c46b80998;hp=519083b763e9475f3d9dcfa2421f0cfa31f5d584;hb=904acb531e17ea1900c9a8300591ba222d521c7e;hpb=7c7d3dc2c37eb93a41b450dfa552481c23155122 diff --git a/grml2usb b/grml2usb index 519083b..42362d6 100755 --- a/grml2usb +++ b/grml2usb @@ -18,10 +18,12 @@ from inspect import isroutine, isclass import datetime, logging, os, re, subprocess, sys, tempfile, time # global variables -PROG_VERSION = "0.9.2" +PROG_VERSION = "0.9.8" MOUNTED = set() # register mountpoints TMPFILES = set() # register tmpfiles DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg +GRML_FLAVOURS = set() # which flavours are being installed? +global GRML_DEFAULT # cmdline parsing USAGE = "Usage: %prog [options] <[ISO[s] | /live/image]> \n\ @@ -30,7 +32,7 @@ USAGE = "Usage: %prog [options] <[ISO[s] | /live/image]> \n\ Make sure you have at least one grml ISO or a running grml system (/live/image),\n\ grub or syslinux and root access.\n\ \n\ -Execute %prog --help for usage hints, further information can be found in: man grml2usb" +Run %prog --help for usage hints, further information via: man grml2usb" # pylint: disable-msg=C0103 parser = OptionParser(usage=USAGE) @@ -53,14 +55,18 @@ parser.add_option("--force", dest="force", action="store_true", # help="install specified kernel instead of the default [TODO - not implemented yet]") parser.add_option("--lilo-binary", dest="lilobin", action="store", type="string", help="lilo executable to be used for installing MBR") -parser.add_option("--mbr-manager", dest="mbrmgr", action="store_true", - help="enable interactive boot manager menu in MBR") +parser.add_option("--mbr-menu", dest="mbrmenu", action="store_true", + 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("--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", + help="skip generation of grub configuration files") parser.add_option("--skip-mbr", dest="skipmbr", action="store_true", help="do not install a master boot record (MBR) on the device") +parser.add_option("--skip-syslinux-config", dest="skipsyslinuxconfig", action="store_true", + help="skip generation of syslinux configuration files") parser.add_option("--syslinux", dest="syslinux", action="store_true", help="install syslinux bootloader instead of grub") parser.add_option("--syslinux-mbr", dest="syslinuxmbr", action="store_true", @@ -228,11 +234,10 @@ def mkfs_fat16(device): raise CriticalException("error executing mkfs.vfat") -def generate_main_grub2_config(grml_flavour, install_partition, bootoptions): +def generate_main_grub2_config(grml_flavour, bootoptions): """Generate grub2 configuration for use via grub.cfg @grml_flavour: name of grml flavour the configuration should be generated for - @install_partition: partition number for use in (hd0,X) @bootoptions: additional bootoptions that should be used by default""" local_datestamp = DATESTAMP @@ -244,7 +249,7 @@ set timeout=5 insmod fat -if font (hd0,%(install_partition)s)/boot/grub/ascii.pff ; then +if font /boot/grub/ascii.pff ; then insmod png set gfxmode=640x480 insmod gfxterm @@ -252,7 +257,7 @@ if font (hd0,%(install_partition)s)/boot/grub/ascii.pff ; then terminal gfxterm fi -if background_image (hd0,%(install_partition)s)/boot/grub/grml.png ; then +if background_image /boot/grub/grml.png ; then set color_normal=black/black set color_highlight=red/black else @@ -261,31 +266,26 @@ else 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 live-media-path=/live/%(grml_flavour)s/ %(bootoptions)s + linux /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 /boot/release/%(grml_flavour)s/initrd.gz } menuentry "Memory test (memtest86+)" { - set root=(hd0,%(install_partition)s) linux /boot/addons/memtest } menuentry "Grub - all in one image" { - set root=(hd0,%(install_partition)s) linux /boot/addons/memdisk initrd /boot/addons/allinone.img } menuentry "FreeDOS" { - set root=(hd0,%(install_partition)s) linux /boot/addons/memdisk initrd /boot/addons/balder10.imz } -menuentry "MirBSD" { - set root=(hd0,%(install_partition)s) - linux /boot/addons/bsd4grml/ldbsd.com +menuentry "MirOS BSD" { + multiboot /boot/addons/bsd4grml/ldbsd.com } menuentry "Boot OS of first partition on first disk" { @@ -294,14 +294,13 @@ menuentry "Boot OS of first partition on first disk" { } """ % {'grml_flavour': grml_flavour, 'local_datestamp': local_datestamp, - 'bootoptions': bootoptions, 'install_partition': install_partition } ) + 'bootoptions': bootoptions } ) -def generate_flavour_specific_grub2_config(grml_flavour, install_partition, bootoptions): +def generate_flavour_specific_grub2_config(grml_flavour, bootoptions): """Generate grub2 configuration for use via grub.cfg @grml_flavour: name of grml flavour the configuration should be generated for - @install_partition: partition number for use in (hd0,X) @bootoptions: additional bootoptions that should be used by default""" local_datestamp = DATESTAMP @@ -309,62 +308,60 @@ def generate_flavour_specific_grub2_config(grml_flavour, install_partition, boot 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 live-media-path=/live/%(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-persistent" { + linux /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 /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 live-media-path=/live/%(grml_flavour)s/ toram=%(grml_flavour)s %(bootoptions)s + linux /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 /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 live-media-path=/live/%(grml_flavour)s/ debug boot=live initcall_debug%(bootoptions)s + linux /boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce vga=791 quiet live-media-path=/live/%(grml_flavour)s/ debug boot=live initcall_debug%(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-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 live-media-path=/live/%(grml_flavour)s/ startx=wm-ng %(bootoptions)s + linux /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 /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-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 live-media-path=/live/%(grml_flavour)s/ vga=normal video=ofonly %(bootoptions)s + 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 } ## 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 live-media-path=/live/%(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 + linux /boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ vga=normal boot=live 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 %(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-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 live-media-path=/live/%(grml_flavour)s/ nofstab noraid nolvm noautoconfig noswap raid=noautodetect %(bootoptions)s + linux /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 /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-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 live-media-path=/live/%(grml_flavour)s/ vga=normal video=vesafb:off console=tty1 console=ttyS0,9600n8 %(bootoptions)s + linux /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 /boot/release/%(grml_flavour)s/initrd.gz } """ % {'grml_flavour': grml_flavour, 'local_datestamp': local_datestamp, - 'bootoptions': bootoptions, 'install_partition': install_partition } ) + 'bootoptions': bootoptions } ) def generate_flavour_specific_grub1_config(grml_flavour, install_partition, bootoptions): @@ -383,8 +380,13 @@ kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=pow initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)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 + +## 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 %(bootoptions)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/ toram=%(grml_flavour)s.squashfs %(bootoptions)s initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz ## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] @@ -404,12 +406,12 @@ initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)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 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 +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 boot=live 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 %(bootoptions)s initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)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 %(bootoptions)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/ nofstab noraid nolvm noautoconfig noswap raid=noautodetect forensic readonly %(bootoptions)s initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz ## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] @@ -439,7 +441,7 @@ background = FFCC33 # 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 lang=us vga=791 quiet boot=live nomce live-media-path=/live/%(grml_flavour)s/ +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 title Memory test (memtest86+) @@ -453,7 +455,7 @@ title FreeDOS kernel (hd0,%(install_partition)s)/boot/addons/memdisk initrd (hd0,%(install_partition)s)/boot/addons/balder10.imz -title MirBSD +title MirOS BSD kernel (hd0,%(install_partition)s)/boot/addons/bsd4grml/ldbsd.com """ % {'grml_flavour': grml_flavour, 'local_datestamp': local_datestamp, @@ -532,6 +534,11 @@ LABEL bsd MENU LABEL bsd KERNEL /boot/addons/bsd4grml/ldbsd.com +# hardware detection tool +MENU LABEL hdt +KERNEL /boot/addons/hdt.c32 +APPEND pciids=/boot/addons/pci.ids + ## end of global configuration """ % {'grml_flavour': grml_flavour, 'local_datestamp': local_datestamp, 'bootoptions': bootoptions} ) @@ -552,9 +559,14 @@ KERNEL /boot/release/%(grml_flavour)s/linux26 APPEND initrd=/boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live nomce vga=791 quiet live-media-path=/live/%(grml_flavour)s/ %(bootoptions)s # flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] +LABEL %(grml_flavour)s-persistent +KERNEL /boot/release/%(grml_flavour)s/linux26 +APPEND initrd=/boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live nomce vga=791 quiet persistent live-media-path=/live/%(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 vga=791 quiet live-media-path=/live/%(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 live-media-path=/live/%(grml_flavour)s/ toram=%(grml_flavour)s.squashfs %(bootoptions)s # flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] LABEL %(grml_flavour)s-debug @@ -574,12 +586,12 @@ APPEND initrd=/boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live n # flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] LABEL %(grml_flavour)s-failsafe KERNEL /boot/release/%(grml_flavour)s/linux26 -APPEND initrd=/boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live nomce quiet live-media-path=/live/%(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 +APPEND initrd=/boot/release/%(grml_flavour)s/initrd.gz apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ vga=normal boot=live 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 %(bootoptions)s # 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 vga=791 quiet live-media-path=/live/%(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 live-media-path=/live/%(grml_flavour)s/ nofstab noraid nolvm noautoconfig noswap raid=noautodetect forensic readonly %(bootoptions)s # flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] LABEL %(grml_flavour)s-serial @@ -606,7 +618,10 @@ def install_grub(device): "--root-directory=%s" % device_mountpoint, device], stdout=file(os.devnull, "r+")) proc.wait() if proc.returncode != 0: - raise Exception("error executing grub-install") + # raise Exception("error executing grub-install") + logging.critical("Fatal: error executing grub-install (please check the grml2usb FAQ)") + cleanup() + sys.exit(1) except CriticalException, error: logging.critical("Fatal: %s" % error) cleanup() @@ -650,12 +665,17 @@ def install_bootloader(device): cleanup() sys.exit(1) else: - try: - install_grub(device) - except CriticalException, error: - logging.critical("Fatal: %s" % error) + if not which("grub-install"): + logging.critical("Fatal: grub-install not available (please install the grub package or use the --syslinux option)") cleanup() sys.exit(1) + else: + try: + install_grub(device) + except CriticalException, error: + logging.critical("Fatal: %s" % error) + cleanup() + sys.exit(1) def execute_lilo(lilo, device): @@ -703,21 +723,26 @@ def install_syslinux_mbr(device): def install_mir_mbr(mbrtemplate, device, partition, ismirbsdmbr=True): """install 'mbr' master boot record (MBR) on 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". + 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". @mbrtemplate: default MBR file - @device: name of a file assumed to be a hard disc (or USB stick) image, - or something like "/dev/sdb" + @device: 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 (or 439 - if ismirbsdmbr) bytes. + @mbrtemplate: must be a valid MBR file of at least 440 (or 439 if + ismirbsdmbr) bytes. - @ismirbsdmbr: if set the partitions' active flags are not changed. - Instead, the MBR's default value is set accordingly.""" + @ismirbsdmbr: if true then ignore the active flag, set the mirbsdmbr + specific flag to 0/1/2/3 and set the MBR's default value accordingly. If + false then leave the mirbsdmbr specific flag set to FFh, set all + active flags to 0 and set the active flag of the partition to 80h. Note: + behaviour of mirbsdmbr: if flag = 0/1/2/3 then use it, otherwise search for + the active flag.""" logging.info("Installing default MBR") @@ -842,7 +867,7 @@ def mount(source, target, mount_options): raise CriticalException("Error executing mount: %s already mounted - please unmount before invoking grml2usb" % source) if os.path.isdir(source): - logging.debug("Source %s is not a device, not mounting therefor." % source) + logging.debug("Source %s is not a device, therefore not mounting." % source) return 0 logging.debug("mount %s %s %s" % (mount_options, source, target)) @@ -864,7 +889,7 @@ def unmount(target, unmount_options): # make sure we unmount only already mounted targets target_unmount = False mounts = open('/proc/mounts').readlines() - mountstring = re.compile(".*%s.*" % re.escape(target)) + mountstring = re.compile(".*%s.*" % re.escape(os.path.realpath(target))) for line in mounts: if re.match(mountstring, line): target_unmount = True @@ -889,13 +914,18 @@ def check_for_usbdevice(device): """ usbdevice = re.match(r'/dev/(.*?)\d*$', device).group(1) - usbdevice = os.path.realpath('/sys/class/block/' + usbdevice + '/removable') - if os.path.isfile(usbdevice): - is_usb = open(usbdevice).readline() - if is_usb == "1": + # newer systems: + usbdev = os.path.realpath('/sys/class/block/' + usbdevice + '/removable') + if not os.path.isfile(usbdev): + # Ubuntu with kernel 2.6.24 for example: + usbdev = os.path.realpath('/sys/block/' + usbdevice + '/removable') + + if os.path.isfile(usbdev): + is_usb = open(usbdev).readline() + if is_usb.find("1"): return 0 - else: - return 1 + + return 1 def check_for_fat(partition): @@ -904,7 +934,7 @@ def check_for_fat(partition): @partition: device name of partition""" try: - udev_info = subprocess.Popen(["/lib/udev/vol_id", "-t", partition], + udev_info = subprocess.Popen(["/sbin/blkid", "-s", "TYPE", "-o", "value", partition], stdout=subprocess.PIPE, stderr=subprocess.PIPE) filesystem = udev_info.communicate()[0].rstrip() @@ -916,7 +946,7 @@ def check_for_fat(partition): raise CriticalException("Partition %s does not contain a FAT16 filesystem. (Use --fat16 or run mkfs.vfat %s)" % (partition, partition)) except OSError: - raise CriticalException("Sorry, /lib/udev/vol_id not available.") + raise CriticalException("Sorry, /sbin/blkid not available (install e2fsprogs?)") def mkdir(directory): @@ -941,19 +971,20 @@ def copy_system_files(grml_flavour, iso_mount, target): squashfs = search_file(grml_flavour + '.squashfs', iso_mount) if squashfs is None: logging.critical("Fatal: squashfs file not found") + raise CriticalException("error locating squashfs file") else: squashfs_target = target + '/live/' + grml_flavour + '/' execute(mkdir, squashfs_target) - logging.debug("cp %s %s" % (squashfs, squashfs_target + grml_flavour + '.squashfs')) - proc = subprocess.Popen(["cp", squashfs, squashfs_target + grml_flavour + ".squashfs"]) + logging.debug("rsync -aHS %s %s" % (squashfs, squashfs_target + grml_flavour + '.squashfs')) + proc = subprocess.Popen(["rsync", "-aHS", squashfs, squashfs_target + grml_flavour + ".squashfs"]) proc.wait() filesystem_module = search_file('filesystem.module', iso_mount) if filesystem_module is None: logging.critical("Fatal: filesystem.module not found") else: - logging.debug("cp %s %s" % (filesystem_module, squashfs_target + 'filesystem.module')) - proc = subprocess.Popen(["cp", filesystem_module, squashfs_target + 'filesystem.module']) + logging.debug("rsync -aHS %s %s" % (filesystem_module, squashfs_target + 'filesystem.module')) + proc = subprocess.Popen(["rsync", "-aHS", filesystem_module, squashfs_target + 'filesystem.module']) proc.wait() release_target = target + '/boot/release/' + grml_flavour @@ -963,16 +994,16 @@ def copy_system_files(grml_flavour, iso_mount, target): if kernel is None: logging.critical("Fatal kernel not found") else: - logging.debug("cp %s %s" % (kernel, release_target + '/linux26')) - proc = subprocess.Popen(["cp", kernel, release_target + '/linux26']) + logging.debug("rsync -aHS %s %s" % (kernel, release_target + '/linux26')) + proc = subprocess.Popen(["rsync", "-aHS", kernel, release_target + '/linux26']) proc.wait() initrd = search_file('initrd.gz', iso_mount) if initrd is None: logging.critical("Fatal: initrd not found") else: - logging.debug("cp %s %s" % (initrd, release_target + '/initrd.gz')) - proc = subprocess.Popen(["cp", initrd, release_target + '/initrd.gz']) + logging.debug("rsync -aHS %s %s" % (initrd, release_target + '/initrd.gz')) + proc = subprocess.Popen(["rsync", "-aHS", initrd, release_target + '/initrd.gz']) proc.wait() @@ -990,8 +1021,8 @@ def copy_grml_files(iso_mount, target): if grml_file is None: logging.warn("Warning: myfile %s could not be found - can not install it", myfile) else: - logging.debug("cp %s %s" % (grml_file, grml_target + grml_file)) - proc = subprocess.Popen(["cp", grml_file, grml_target + myfile]) + logging.debug("rsync -aHS %s %s" % (grml_file, grml_target + grml_file)) + proc = subprocess.Popen(["rsync", "-aHS", grml_file, grml_target + myfile]) proc.wait() grml_web_target = grml_target + '/web/' @@ -1002,8 +1033,8 @@ def copy_grml_files(iso_mount, target): if grml_file is None: logging.warn("Warning: myfile %s could not be found - can not install it") else: - logging.debug("cp %s %s" % (grml_file, grml_web_target + grml_file)) - proc = subprocess.Popen(["cp", grml_file, grml_web_target + myfile]) + logging.debug("rsync -aHS %s %s" % (grml_file, grml_web_target + grml_file)) + proc = subprocess.Popen(["rsync", "-aHS", grml_file, grml_web_target + myfile]) proc.wait() grml_webimg_target = grml_web_target + '/images/' @@ -1014,8 +1045,8 @@ def copy_grml_files(iso_mount, target): if grml_file is None: logging.warn("Warning: myfile %s could not be found - can not install it") else: - logging.debug("cp %s %s" % (grml_file, grml_webimg_target + grml_file)) - proc = subprocess.Popen(["cp", grml_file, grml_webimg_target + myfile]) + logging.debug("rsync -aHS %s %s" % (grml_file, grml_webimg_target + grml_file)) + proc = subprocess.Popen(["rsync", "-aHS", grml_file, grml_webimg_target + myfile]) proc.wait() @@ -1031,51 +1062,62 @@ def copy_addons(iso_mount, target): # grub all-in-one image allinoneimg = search_file('allinone.img', iso_mount) if allinoneimg is None: - logging.warn("Warning: allinone.img not found - can not install it...") - logging.warn(" |-> that's fine if you don't need it") + logging.warn("Warning: allinone.img not found (that's fine if you don't need it)") else: - logging.debug("cp %s %s" % (allinoneimg, addons + '/allinone.img')) - proc = subprocess.Popen(["cp", allinoneimg, addons + 'allinone.img']) + logging.debug("rsync -aHS %s %s" % (allinoneimg, addons + '/allinone.img')) + proc = subprocess.Popen(["rsync", "-aHS", allinoneimg, addons + 'allinone.img']) proc.wait() # bsd imag bsdimg = search_file('bsd4grml', iso_mount) if bsdimg is None: - logging.warn("Warning: bsd4grml not found - can not install it...") - logging.warn(" |-> that's fine if you don't need it") + logging.warn("Warning: bsd4grml not found (that's fine if you don't need it)") else: - logging.debug("cp -a %s %s" % (bsdimg, addons + '/')) - proc = subprocess.Popen(["cp", "-a", bsdimg, addons + '/']) + logging.debug("rsync -aHS %s %s" % (bsdimg, addons + '/')) + proc = subprocess.Popen(["rsync", "-aHS", bsdimg, addons + '/']) proc.wait() # freedos image balderimg = search_file('balder10.imz', iso_mount) if balderimg is None: - logging.warn("Warning: balder10.imz not found - can not install it...") - logging.warn(" |-> that's fine if you don't need it") + logging.warn("Warning: balder10.imz not found (that's fine if you don't need it)") else: - logging.debug("cp %s %s" % (balderimg, addons + '/balder10.imz')) - proc = subprocess.Popen(["cp", balderimg, addons + 'balder10.imz']) + logging.debug("rsync -aHS %s %s" % (balderimg, addons + '/balder10.imz')) + proc = subprocess.Popen(["rsync", "-aHS", balderimg, addons + 'balder10.imz']) proc.wait() + # install hdt and pci.ids only when using syslinux (grub doesn't support it) + if options.syslinux: + # hdt (hardware detection tool) image + hdtimg = search_file('hdt.c32', iso_mount) + if hdtimg: + logging.debug("rsync -aHS %s %s" % (hdtimg, addons + '/hdt.c32')) + proc = subprocess.Popen(["rsync", "-aHS", hdtimg, addons + '/hdt.c32']) + proc.wait() + + # pci.ids file + picids = search_file('pci.ids', iso_mount) + if picids: + logging.debug("rsync -aHS %s %s" % (picids, addons + '/pci.ids')) + proc = subprocess.Popen(["rsync", "-aHS", picids, addons + '/pci.ids']) + proc.wait() + # memdisk image memdiskimg = search_file('memdisk', iso_mount) if memdiskimg is None: - logging.warn("Warning: memdisk not found - can not install it...") - logging.warn(" |-> that's fine if you don't need it") + logging.warn("Warning: memdisk not found (that's fine if you don't need it)") else: - logging.debug("cp %s %s" % (memdiskimg, addons + '/memdisk')) - proc = subprocess.Popen(["cp", memdiskimg, addons + 'memdisk']) + logging.debug("rsync -aHS %s %s" % (memdiskimg, addons + '/memdisk')) + proc = subprocess.Popen(["rsync", "-aHS", 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...") - logging.warn(" |-> that's fine if you don't need it") + logging.warn("Warning: memtest not found (that's fine if you don't need it)") else: - logging.debug("cp %s %s" % (memtestimg, addons + '/memtest')) - proc = subprocess.Popen(["cp", memtestimg, addons + 'memtest']) + logging.debug("rsync -aHS %s %s" % (memtestimg, addons + '/memtest')) + proc = subprocess.Popen(["rsync", "-aHS", memtestimg, addons + 'memtest']) proc.wait() @@ -1089,14 +1131,14 @@ def copy_bootloader_files(iso_mount, target): execute(mkdir, syslinux_target) logo = search_file('logo.16', iso_mount) - logging.debug("cp %s %s" % (logo, syslinux_target + 'logo.16')) - proc = subprocess.Popen(["cp", logo, syslinux_target + 'logo.16']) + logging.debug("rsync -aHS %s %s" % (logo, syslinux_target + 'logo.16')) + proc = subprocess.Popen(["rsync", "-aHS", logo, syslinux_target + 'logo.16']) proc.wait() for ffile in 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9', 'f10': bootsplash = search_file(ffile, iso_mount) - logging.debug("cp %s %s" % (bootsplash, syslinux_target + ffile)) - proc = subprocess.Popen(["cp", bootsplash, syslinux_target + ffile]) + logging.debug("rsync -aHS %s %s" % (bootsplash, syslinux_target + ffile)) + proc = subprocess.Popen(["rsync", "-aHS", bootsplash, syslinux_target + ffile]) proc.wait() grub_target = target + '/boot/grub/' @@ -1104,24 +1146,25 @@ def copy_bootloader_files(iso_mount, target): if not os.path.isfile("/usr/share/grml2usb/grub/splash.xpm.gz"): logging.critical("Error: /usr/share/grml2usb/grub/splash.xpm.gz can not be read.") + logging.critical("Please make sure you've the grml2usb Debian package installed!") raise else: - logging.debug("cp /usr/share/grml2usb/grub/splash.xpm.gz %s" % grub_target + 'splash.xpm.gz') - proc = subprocess.Popen(["cp", '/usr/share/grml2usb/grub/splash.xpm.gz', + logging.debug("rsync -aHS /usr/share/grml2usb/grub/splash.xpm.gz %s" % grub_target + 'splash.xpm.gz') + proc = subprocess.Popen(["rsync", "-aHS", '/usr/share/grml2usb/grub/splash.xpm.gz', grub_target + 'splash.xpm.gz']) proc.wait() # grml splash in grub if os.path.isfile("/usr/share/grml2usb/grub/grml.png"): - logging.debug("cp /usr/share/grml2usb/grub/grml.png to %s" % grub_target + 'grml.png') - proc = subprocess.Popen(["cp", '/usr/share/grml2usb/grub/grml.png', + logging.debug("rsync -aHS /usr/share/grml2usb/grub/grml.png to %s" % grub_target + 'grml.png') + proc = subprocess.Popen(["rsync", "-aHS", '/usr/share/grml2usb/grub/grml.png', grub_target + 'grml.png']) proc.wait() # font file for graphical bootsplash in grub if os.path.isfile("/usr/share/grub/ascii.pff"): - logging.debug("cp /usr/share/grub/ascii.pff to %s" % grub_target + 'ascii.pff') - proc = subprocess.Popen(["cp", '/usr/share/grub/ascii.pff', + logging.debug("rsync -aHS /usr/share/grub/ascii.pff to %s" % grub_target + 'ascii.pff') + proc = subprocess.Popen(["rsync", "-aHS", '/usr/share/grub/ascii.pff', grub_target + 'ascii.pff']) proc.wait() @@ -1143,19 +1186,23 @@ def install_iso_files(grml_flavour, iso_mount, device, target): return 0 elif not options.bootloaderonly: logging.info("Copying files. This might take a while....") - copy_system_files(grml_flavour, iso_mount, target) - copy_grml_files(iso_mount, target) + try: + copy_system_files(grml_flavour, iso_mount, target) + copy_grml_files(iso_mount, target) + except CriticalException, error: + logging.critical("Execution failed: %s", error) + sys.exit(1) if not options.skipaddons: if grml_flavour.endswith('-small'): - logging.info("grml-small doesn't provide any addons, not installing them therefor.") + logging.info("Note: grml-small doesn't provide any addons, not installing them therefore.") else: copy_addons(iso_mount, target) if not options.copyonly: copy_bootloader_files(iso_mount, target) - if not options.dryrun and not os.path.isdir(device): + if not options.dryrun: handle_bootloader_config(grml_flavour, device, target) # make sure we sync filesystems before returning @@ -1233,14 +1280,13 @@ def handle_grub1_config(grml_flavour, install_partition, grub_target, bootopt): if grub_flavour_config: grub1_config_file = open(grub1_cfg, 'a') grub1_config_file.write(generate_flavour_specific_grub1_config(grml_flavour, install_partition, bootopt)) - grub1_config_file.close( ) + grub1_config_file.close() -def handle_grub2_config(grml_flavour, install_partition, grub_target, bootopt): +def handle_grub2_config(grml_flavour, grub_target, bootopt): """Main handler for generating grub2 configuration @grml_flavour: name of grml flavour the configuration should be generated for - @install_partition: partition number for use in (hd0,X) @grub_target: path of grub's configuration files @bootoptions: additional bootoptions that should be used by default""" @@ -1248,22 +1294,27 @@ def handle_grub2_config(grml_flavour, install_partition, grub_target, bootopt): grub2_cfg = grub_target + 'grub.cfg' logging.debug("Creating grub2 configuration file (grub.lst)") + global GRML_DEFAULT + # install main configuration only *once*, no matter how many ISOs we have: + grub_flavour_is_default = False 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) + GRML_DEFAULT = grml_flavour grub_flavour_is_default = True - grub2_config_file.write(generate_main_grub2_config(grml_flavour, install_partition, bootopt)) + grub2_config_file.write(generate_main_grub2_config(grml_flavour, bootopt)) grub2_config_file.close() else: 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, bootopt)) + GRML_DEFAULT = grml_flavour + grub_flavour_is_default = True + grub2_config_file.write(generate_main_grub2_config(grml_flavour, bootopt)) grub2_config_file.close() + # install flavour specific configuration only *once* as well grub_flavour_config = True if os.path.isfile(grub2_cfg): string = open(grub2_cfg).readlines() @@ -1276,9 +1327,9 @@ def handle_grub2_config(grml_flavour, install_partition, grub_target, bootopt): grub2_config_file = open(grub2_cfg, 'a') # display only if the grml flavour isn't the default if not grub_flavour_is_default: - logging.info("Note: you can boot flavour %s using '%s' on the commandline." % (grml_flavour, grml_flavour)) - grub2_config_file.write(generate_flavour_specific_grub2_config(grml_flavour, install_partition, bootopt)) - grub2_config_file.close( ) + GRML_FLAVOURS.add(grml_flavour) + grub2_config_file.write(generate_flavour_specific_grub2_config(grml_flavour, bootopt)) + grub2_config_file.close() def handle_grub_config(grml_flavour, device, target): @@ -1293,12 +1344,13 @@ def handle_grub_config(grml_flavour, device, target): grub_target = target + '/boot/grub/' execute(mkdir, grub_target) - # we have to adjust root() inside grub configuration - if device[-1:].isdigit(): - install_grub1_partition = int(device[-1:]) - 1 - install_grub2_partition = device[-1:] + if os.path.isdir(device): + install_grub1_partition = None else: - raise CriticalException("error validating partition schema (raw device?)") + if device[-1:].isdigit(): + install_grub1_partition = int(device[-1:]) - 1 + else: + raise CriticalException("error validating partition schema (raw device?)") # do NOT write "None" in kernel cmdline if options.bootoptions is None: @@ -1307,9 +1359,10 @@ def handle_grub_config(grml_flavour, device, target): bootopt = options.bootoptions # write menu.lst - handle_grub1_config(grml_flavour, install_grub1_partition, grub_target, bootopt) + if install_grub1_partition: + handle_grub1_config(grml_flavour, install_grub1_partition, grub_target, bootopt) # write grub.cfg - handle_grub2_config(grml_flavour, install_grub2_partition, grub_target, bootopt) + handle_grub2_config(grml_flavour, grub_target, bootopt) def handle_syslinux_config(grml_flavour, target): @@ -1324,32 +1377,36 @@ def handle_syslinux_config(grml_flavour, target): else: bootopt = options.bootoptions - logging.info("Generating syslinux configuration") + logging.debug("Generating syslinux configuration") syslinux_target = target + '/boot/syslinux/' # should be present via copy_bootloader_files(), but make sure it exits: execute(mkdir, syslinux_target) syslinux_cfg = syslinux_target + 'syslinux.cfg' + global GRML_DEFAULT + # install main configuration only *once*, no matter how many ISOs we have: + syslinux_flavour_is_default = False if os.path.isfile(syslinux_cfg): string = open(syslinux_cfg).readline() 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("Note: grml flavour %s is being installed as the default booting system." % grml_flavour) + GRML_DEFAULT = grml_flavour + syslinux_flavour_is_default = True syslinux_config_file.write(generate_main_syslinux_config(grml_flavour, bootopt)) syslinux_config_file.close() else: syslinux_config_file = open(syslinux_cfg, 'w') + GRML_DEFAULT = grml_flavour + syslinux_flavour_is_default = True syslinux_config_file.write(generate_main_syslinux_config(grml_flavour, bootopt)) syslinux_config_file.close() # install flavour specific configuration only *once* as well - # kind of ugly - I'm pretty sure this could be smoother... syslinux_flavour_config = True if os.path.isfile(syslinux_cfg): string = open(syslinux_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): @@ -1357,13 +1414,16 @@ def handle_syslinux_config(grml_flavour, target): if syslinux_flavour_config: syslinux_config_file = open(syslinux_cfg, 'a') + # display only if the grml flavour isn't the default + if not syslinux_flavour_is_default: + GRML_FLAVOURS.add(grml_flavour) syslinux_config_file.write(generate_flavour_specific_syslinux_config(grml_flavour, bootopt)) - syslinux_config_file.close( ) + syslinux_config_file.close() logging.debug("Generating isolinux/syslinux splash %s" % syslinux_target + 'boot.msg') isolinux_splash = open(syslinux_target + 'boot.msg', 'w') isolinux_splash.write(generate_isolinux_splash(grml_flavour)) - isolinux_splash.close( ) + isolinux_splash.close() def handle_bootloader_config(grml_flavour, device, target): @@ -1373,8 +1433,17 @@ def handle_bootloader_config(grml_flavour, device, target): @device: device/partition where bootloader should be installed to @target: path of bootloader's configuration files""" - if options.syslinux: - handle_syslinux_config(grml_flavour, target) + if options.skipsyslinuxconfig: + logging.info("Skipping generation of syslinux configuration as requested.") + else: + try: + handle_syslinux_config(grml_flavour, target) + except CriticalException, error: + logging.critical("Fatal: %s" % error) + sys.exit(1) + + if options.skipgrubconfig: + logging.info("Skipping generation of grub configuration as requested.") else: try: handle_grub_config(grml_flavour, device, target) @@ -1382,6 +1451,47 @@ def handle_bootloader_config(grml_flavour, device, target): logging.critical("Fatal: %s" % error) sys.exit(1) +def handle_dir(live_image, device): + """Main logic for copying files of the currently running grml system. + + @live_image: directory where currently running live system resides (usually /live/image) + @device: partition where the specified ISO should be installed to""" + + logging.info("Using %s as install base" % live_image) + + if os.path.isdir(device): + logging.info("Specified target is a directory, therefore not mounting.") + device_mountpoint = device + remove_device_mountpoint = False + else: + device_mountpoint = tempfile.mkdtemp(prefix="grml2usb") + register_tmpfile(device_mountpoint) + remove_device_mountpoint = True + try: + mount(device, device_mountpoint, "") + except CriticalException, error: + logging.critical("Fatal: %s" % error) + cleanup() + sys.exit(1) + + try: + grml_flavour = identify_grml_flavour(live_image) + logging.info("Identified grml flavour \"%s\"." % grml_flavour) + install_iso_files(grml_flavour, live_image, device, device_mountpoint) + except TypeError: + logging.critical("Fatal: a critical error happend during execution (not a grml ISO?), giving up") + sys.exit(1) + finally: + if remove_device_mountpoint: + try: + unmount(device_mountpoint, "") + if os.path.isdir(device_mountpoint): + os.rmdir(device_mountpoint) + unregister_tmpfile(device_mountpoint) + except CriticalException, error: + logging.critical("Fatal: %s" % error) + cleanup() + def handle_iso(iso, device): """Main logic for mounting ISOs and copying files. @@ -1391,10 +1501,6 @@ def handle_iso(iso, device): logging.info("Using ISO %s" % iso) - if os.path.isdir(iso): - logging.critical("TODO: /live/image handling not yet implemented - sorry") - sys.exit(1) - iso_mountpoint = tempfile.mkdtemp(prefix="grml2usb") register_tmpfile(iso_mountpoint) remove_iso_mountpoint = True @@ -1411,7 +1517,7 @@ def handle_iso(iso, device): sys.exit(1) if os.path.isdir(device): - logging.info("Specified target is a directory, not mounting therefor.") + logging.info("Specified target is a directory, therefore not mounting.") device_mountpoint = device remove_device_mountpoint = False # skip_mbr = True @@ -1439,10 +1545,14 @@ def handle_iso(iso, device): os.rmdir(iso_mountpoint) unregister_tmpfile(iso_mountpoint) if remove_device_mountpoint: - unmount(device_mountpoint, "") - if os.path.isdir(device_mountpoint): - os.rmdir(device_mountpoint) - unregister_tmpfile(device_mountpoint) + try: + unmount(device_mountpoint, "") + if os.path.isdir(device_mountpoint): + os.rmdir(device_mountpoint) + unregister_tmpfile(device_mountpoint) + except CriticalException, error: + logging.critical("Fatal: %s" % error) + cleanup() def handle_mbr(device): @@ -1455,31 +1565,37 @@ def handle_mbr(device): return 0 # make sure we have syslinux available - if not options.skipmbr: - if not which("syslinux") and not options.copyonly: - logging.critical('Sorry, syslinux not available. Exiting.') - logging.critical('Please install syslinux or consider using the --grub option.') - sys.exit(1) + if not which("syslinux") and not options.copyonly: + logging.critical('Sorry, syslinux not available. Exiting.') + logging.critical('Please install syslinux or consider using the --grub option.') + 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 + if device[-1:].isdigit(): + mbr_device = re.match(r'(.*?)\d*$', device).group(1) + partition_number = int(device[-1:]) - 1 + skip_install_mir_mbr = False - try: - if options.syslinuxmbr: - handle_syslinux_mbr(mbr_device) + # if we get e.g. /dev/loop1 as device we don't want to put the MBR + # into /dev/loop of course, therefore use /dev/loop1 as mbr_device + if mbr_device == "/dev/loop": + mbr_device = device + logging.info("Detected loop device - using %s as MBR device therefore" % mbr_device) + skip_install_mir_mbr = True + + try: + if options.syslinuxmbr: + handle_syslinux_mbr(mbr_device) + elif not skip_install_mir_mbr: + if options.mbrmenu: + install_mir_mbr('/usr/share/grml2usb/mbr/mbrmgr', mbr_device, partition_number, True) else: - if options.mbrmgr: - install_mir_mbr('/usr/share/grml2usb/mbr/mbrmgr', mbr_device, partition_number, True) - else: - install_mir_mbr('/usr/share/grml2usb/mbr/mbrldr', mbr_device, partition_number, True) - except IOError, error: - logging.critical("Execution failed: %s", error) - sys.exit(1) - except Exception, error: - logging.critical("Execution failed: %s", error) - sys.exit(1) + install_mir_mbr('/usr/share/grml2usb/mbr/mbrldr', mbr_device, partition_number, False) + except IOError, error: + logging.critical("Execution failed: %s", error) + sys.exit(1) + except Exception, error: + logging.critical("Execution failed: %s", error) + sys.exit(1) def handle_vfat(device): @@ -1544,6 +1660,9 @@ def handle_compat_warning(device): def handle_logging(): """Log handling and configuration""" + if options.verbose and options.quiet: + parser.error("please use either verbose (--verbose) or quiet (--quiet) option") + if options.verbose: FORMAT = "Debug: %(asctime)-15s %(message)s" logging.basicConfig(level=logging.DEBUG, format=FORMAT) @@ -1585,6 +1704,8 @@ def main(): # make sure we have the appropriate permissions check_uid_root() + logging.info("Executing grml2usb version %s", PROG_VERSION) + if options.dryrun: logging.info("Running in simulation mode as requested via option dry-run.") @@ -1594,14 +1715,18 @@ def main(): if not os.path.isdir(device): if device[-1:].isdigit(): - if int(device[-1:]) > 4: + if int(device[-1:]) > 4 or device[-2:].isdigit(): logging.critical("Fatal: installation on partition number >4 not supported. (BIOS won't support it.)") sys.exit(1) else: - if os.path.exists(device): + if os.path.exists(device): logging.critical("Fatal: installation on raw device not supported. (BIOS won't support it.)") sys.exit(1) + if not which("rsync"): + logging.critical("Fatal: rsync not available, can not continue - sorry.") + sys.exit(1) + # provide upgrade path handle_compat_warning(device) @@ -1610,14 +1735,23 @@ def main(): # main operation (like installing files) for iso in isos: - handle_iso(iso, device) + if os.path.isdir(iso): + handle_dir(iso, device) + else: + handle_iso(iso, device) # install mbr if not os.path.isdir(device): - handle_mbr(device) + if not options.skipmbr: + handle_mbr(device) handle_bootloader(device) + logging.info("Note: grml flavour %s was installed as the default booting system." % GRML_DEFAULT) + + for flavour in GRML_FLAVOURS: + logging.info("Note: you can boot flavour %s using '%s' on the commandline." % (flavour, flavour)) + # finally be politely :) logging.info("Finished execution of grml2usb (%s). Have fun with your grml system." % PROG_VERSION)