X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=9a9bb2465c29d1fc6b61e64a70ccdfbdea288d84;hp=9a3bcb120aa4f8c37d271b52b8a97d0298f5c0eb;hb=c224af2da1af4ef51fcc26fee35fadf8b9276e38;hpb=96b7a987b52458633a28242b93451be7f4bce226 diff --git a/grml2usb b/grml2usb index 9a3bcb1..9a9bb24 100755 --- a/grml2usb +++ b/grml2usb @@ -18,7 +18,7 @@ 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.5" MOUNTED = set() # register mountpoints TMPFILES = set() # register tmpfiles DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg @@ -26,10 +26,11 @@ DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier # cmdline parsing USAGE = "Usage: %prog [options] <[ISO[s] | /live/image]> \n\ \n\ -%prog installs a grml ISO to an USB device to be able to boot from it.\n\ +%prog installs grml ISO[s] to an USB device to be able to boot from it.\n\ Make sure you have at least one grml ISO or a running grml system (/live/image),\n\ -syslinux (just run 'aptitude install syslinux' on Debian-based systems)\n\ -and root access. Further information can be found in: man grml2usb" +grub or syslinux and root access.\n\ +\n\ +Run %prog --help for usage hints, further information via: man grml2usb" # pylint: disable-msg=C0103 parser = OptionParser(usage=USAGE) @@ -52,8 +53,8 @@ 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", @@ -215,6 +216,10 @@ def mkfs_fat16(device): @device: partition that should be formated""" # syslinux -d boot/isolinux /dev/sdb1 + if options.dryrun: + logging.info("Would execute mkfs.vfat -F 16 %s now.", device) + return 0 + logging.info("Formating partition with fat16 filesystem") logging.debug("mkfs.vfat -F 16 %s" % device) proc = subprocess.Popen(["mkfs.vfat", "-F", "16", device]) @@ -257,7 +262,7 @@ 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 + 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 } @@ -278,9 +283,9 @@ menuentry "FreeDOS" { initrd /boot/addons/balder10.imz } -menuentry "MirBSD" { +menuentry "MirOS BSD" { set root=(hd0,%(install_partition)s) - linux /boot/addons/bsd4grml/ldbsd.com + multiboot /boot/addons/bsd4grml/ldbsd.com } menuentry "Boot OS of first partition on first disk" { @@ -305,57 +310,57 @@ def generate_flavour_specific_grub2_config(grml_flavour, install_partition, boot ## 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 + 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)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 + 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 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 + 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 module=%(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 module=%(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 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 + 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 module=%(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 %(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 module=%(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, @@ -374,42 +379,42 @@ def generate_flavour_specific_grub1_config(grml_flavour, install_partition, boot 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 module=%(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/ %(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 module=%(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 %(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-debug -kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce vga=791 quiet module=%(grml_flavour)s debug boot=live initcall_debug%(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/ debug boot=live initcall_debug%(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-x -kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce vga=791 quiet module=%(grml_flavour)s startx=wm-ng %(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/ startx=wm-ng %(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-nofb -kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet module=%(grml_flavour)s vga=normal video=ofonly %(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 video=ofonly %(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-failsafe -kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 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 +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 module=%(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 %(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-serial -kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet module=%(grml_flavour)s vga=normal video=vesafb:off console=tty1 console=ttyS0,9600n8 %(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 video=vesafb:off console=tty1 console=ttyS0,9600n8 %(bootoptions)s initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz """ % {'grml_flavour': grml_flavour, 'local_datestamp': local_datestamp, @@ -434,7 +439,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 module=%(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+) @@ -448,7 +453,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, @@ -504,7 +509,7 @@ F10 /boot/syslinux/f10 # 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 vga=791 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 live-media-path=/live/%(grml_flavour)s/ %(bootoptions)s # memtest LABEL memtest @@ -527,6 +532,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} ) @@ -544,42 +554,42 @@ def generate_flavour_specific_syslinux_config(grml_flavour, bootoptions): # 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 vga=791 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 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 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 live-media-path=/live/%(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 vga=791 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 live-media-path=/live/%(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 vga=791 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 live-media-path=/live/%(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 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 vga=normal video=ofonly %(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 video=ofonly %(bootoptions)s # 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 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 +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 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 live-media-path=/live/%(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 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 vga=normal video=vesafb:off console=tty1 console=ttyS0,9600n8 %(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 video=vesafb:off console=tty1 console=ttyS0,9600n8 %(bootoptions)s """ % {'grml_flavour': grml_flavour, 'local_datestamp': local_datestamp, 'bootoptions': bootoptions} ) @@ -592,7 +602,7 @@ def install_grub(device): if options.dryrun: logging.info("Would execute grub-install [--root-directory=mount_point] %s now.", device) else: - device_mountpoint = tempfile.mkdtemp() + device_mountpoint = tempfile.mkdtemp(prefix="grml2usb") register_tmpfile(device_mountpoint) try: mount(device, device_mountpoint, "") @@ -601,7 +611,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)" % error) + cleanup() + sys.exit(1) except CriticalException, error: logging.critical("Fatal: %s" % error) cleanup() @@ -698,21 +711,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") @@ -836,11 +854,15 @@ def mount(source, target, mount_options): if x.startswith(source): 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) + return 0 + logging.debug("mount %s %s %s" % (mount_options, source, target)) proc = subprocess.Popen(["mount"] + list(mount_options) + [source, target]) proc.wait() if proc.returncode != 0: - raise CriticalException("Error executing mount") + raise CriticalException("Error executing mount (no filesystem on the partition?)") else: logging.debug("register_mountpoint(%s)" % target) register_mountpoint(target) @@ -855,7 +877,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 @@ -880,13 +902,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): @@ -901,7 +928,7 @@ def check_for_fat(partition): 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/directory not present?)" % partition) if options.syslinux and filesystem != "vfat": raise CriticalException("Partition %s does not contain a FAT16 filesystem. (Use --fat16 or run mkfs.vfat %s)" % (partition, partition)) @@ -932,21 +959,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/' + squashfs_target = target + '/live/' + grml_flavour + '/' execute(mkdir, squashfs_target) - # use install(1) for now to make sure we can write the files afterwards as normal user as well - logging.debug("cp %s %s" % (squashfs, target + '/live/' + grml_flavour + '.squashfs')) - proc = subprocess.Popen(["install", "--mode=664", squashfs, squashfs_target + grml_flavour + ".squashfs"]) + logging.debug("cp %s %s" % (squashfs, squashfs_target + grml_flavour + '.squashfs')) + proc = subprocess.Popen(["cp", 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 + grml_flavour + '.module')) - proc = subprocess.Popen(["install", "--mode=664", filesystem_module, - squashfs_target + grml_flavour + '.module']) + logging.debug("cp %s %s" % (filesystem_module, squashfs_target + 'filesystem.module')) + proc = subprocess.Popen(["cp", filesystem_module, squashfs_target + 'filesystem.module']) proc.wait() release_target = target + '/boot/release/' + grml_flavour @@ -957,7 +983,7 @@ def copy_system_files(grml_flavour, iso_mount, target): logging.critical("Fatal kernel not found") else: logging.debug("cp %s %s" % (kernel, release_target + '/linux26')) - proc = subprocess.Popen(["install", "--mode=664", kernel, release_target + '/linux26']) + proc = subprocess.Popen(["cp", kernel, release_target + '/linux26']) proc.wait() initrd = search_file('initrd.gz', iso_mount) @@ -965,7 +991,7 @@ def copy_system_files(grml_flavour, iso_mount, target): logging.critical("Fatal: initrd not found") else: logging.debug("cp %s %s" % (initrd, release_target + '/initrd.gz')) - proc = subprocess.Popen(["install", "--mode=664", initrd, release_target + '/initrd.gz']) + proc = subprocess.Popen(["cp", initrd, release_target + '/initrd.gz']) proc.wait() @@ -984,7 +1010,7 @@ def copy_grml_files(iso_mount, target): 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(["install", "--mode=664", grml_file, grml_target + myfile]) + proc = subprocess.Popen(["cp", grml_file, grml_target + myfile]) proc.wait() grml_web_target = grml_target + '/web/' @@ -996,7 +1022,7 @@ def copy_grml_files(iso_mount, target): 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(["install", "--mode=664", grml_file, grml_web_target + myfile]) + proc = subprocess.Popen(["cp", grml_file, grml_web_target + myfile]) proc.wait() grml_webimg_target = grml_web_target + '/images/' @@ -1008,7 +1034,7 @@ def copy_grml_files(iso_mount, target): 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(["install", "--mode=664", grml_file, grml_webimg_target + myfile]) + proc = subprocess.Popen(["cp", grml_file, grml_webimg_target + myfile]) proc.wait() @@ -1024,16 +1050,16 @@ 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("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(["install", "--mode=664", allinoneimg, addons + 'allinone.img']) + proc = subprocess.Popen(["cp", 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("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 + '/']) @@ -1042,28 +1068,44 @@ def copy_addons(iso_mount, target): # 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("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(["install", "--mode=664", balderimg, addons + 'balder10.imz']) + proc = subprocess.Popen(["cp", 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("cp %s %s" % (hdtimg, addons + '/hdt.c32')) + proc = subprocess.Popen(["cp", hdtimg, addons + '/hdt.c32']) + proc.wait() + + # pci.ids file + picids = search_file('pci.ids', iso_mount) + if picids: + logging.debug("cp %s %s" % (picids, addons + '/pci.ids')) + proc = subprocess.Popen(["cp", 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("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(["install", "--mode=664", memdiskimg, addons + 'memdisk']) + proc = subprocess.Popen(["cp", 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("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(["install", "--mode=664", memtestimg, addons + 'memtest']) + proc = subprocess.Popen(["cp", memtestimg, addons + 'memtest']) proc.wait() @@ -1078,13 +1120,13 @@ def copy_bootloader_files(iso_mount, target): logo = search_file('logo.16', iso_mount) logging.debug("cp %s %s" % (logo, syslinux_target + 'logo.16')) - proc = subprocess.Popen(["install", "--mode=664", logo, syslinux_target + 'logo.16']) + proc = subprocess.Popen(["cp", 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(["install", "--mode=664", bootsplash, syslinux_target + ffile]) + proc = subprocess.Popen(["cp", bootsplash, syslinux_target + ffile]) proc.wait() grub_target = target + '/boot/grub/' @@ -1092,24 +1134,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(["install", "--mode=664", '/usr/share/grml2usb/grub/splash.xpm.gz', + proc = subprocess.Popen(["cp", '/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(["install", "--mode=664", '/usr/share/grml2usb/grub/grml.png', + proc = subprocess.Popen(["cp", '/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(["install", "--mode=664", '/usr/share/grub/ascii.pff', + proc = subprocess.Popen(["cp", '/usr/share/grub/ascii.pff', grub_target + 'ascii.pff']) proc.wait() @@ -1119,6 +1162,7 @@ def install_iso_files(grml_flavour, iso_mount, device, target): @grml_flavour: name of grml flavour the configuration should be generated for @iso_mount: path where a grml ISO is mounted on + @device: device/partition where bootloader should be installed to @target: path where grml's main files should be copied to""" # TODO => several improvements: @@ -1127,20 +1171,26 @@ def install_iso_files(grml_flavour, iso_mount, device, target): # * catch "install: .. No space left on device" & CO if options.dryrun: - logging.info("Would copy files to %s", iso_mount) 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: - copy_addons(iso_mount, target) + if grml_flavour.endswith('-small'): + logging.info("Note: grml-small doesn't provide any addons, not installing them therefor.") + else: + copy_addons(iso_mount, target) if not options.copyonly: copy_bootloader_files(iso_mount, target) - if not options.dryrun: + if not options.dryrun and not os.path.isdir(device): handle_bootloader_config(grml_flavour, device, target) # make sure we sync filesystems before returning @@ -1200,7 +1250,6 @@ def handle_grub1_config(grml_flavour, install_partition, grub_target, bootopt): main_identifier = re.compile(".*main config generated at: %s.*" % re.escape(str(DATESTAMP))) if not re.match(main_identifier, string): grub1_config_file = open(grub1_cfg, 'w') - # logging.info("Note: grml flavour %s is being installed as the default booting system." % grml_flavour) grub1_config_file.write(generate_main_grub1_config(grml_flavour, install_partition, bootopt)) grub1_config_file.close() else: @@ -1211,7 +1260,6 @@ def handle_grub1_config(grml_flavour, install_partition, grub_target, bootopt): grub_flavour_config = True if os.path.isfile(grub1_cfg): string = open(grub1_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): @@ -1220,7 +1268,7 @@ 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): @@ -1236,23 +1284,27 @@ def handle_grub2_config(grml_flavour, install_partition, grub_target, bootopt): logging.debug("Creating grub2 configuration file (grub.lst)") # 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) + grub_flavour_is_default = True grub2_config_file.write(generate_main_grub2_config(grml_flavour, install_partition, 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) + grub_flavour_is_default = True grub2_config_file.write(generate_main_grub2_config(grml_flavour, install_partition, 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() - 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): @@ -1260,8 +1312,11 @@ def handle_grub2_config(grml_flavour, install_partition, grub_target, bootopt): if grub_flavour_config: 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( ) + grub2_config_file.close() def handle_grub_config(grml_flavour, device, target): @@ -1280,6 +1335,8 @@ def handle_grub_config(grml_flavour, device, target): if device[-1:].isdigit(): install_grub1_partition = int(device[-1:]) - 1 install_grub2_partition = device[-1:] + else: + raise CriticalException("error validating partition schema (raw device?)") # do NOT write "None" in kernel cmdline if options.bootoptions is None: @@ -1312,25 +1369,27 @@ def handle_syslinux_config(grml_flavour, target): syslinux_cfg = syslinux_target + 'syslinux.cfg' # 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) + 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') + logging.info("Note: grml flavour %s is being installed as the default booting system." % 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): @@ -1338,13 +1397,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: + logging.info("Note: you can boot flavour %s using '%s' on the commandline." % (grml_flavour, 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): @@ -1357,7 +1419,11 @@ def handle_bootloader_config(grml_flavour, device, target): if options.syslinux: handle_syslinux_config(grml_flavour, target) else: - handle_grub_config(grml_flavour, device, target) + try: + handle_grub_config(grml_flavour, device, target) + except CriticalException, error: + logging.critical("Fatal: %s" % error) + sys.exit(1) def handle_iso(iso, device): @@ -1372,7 +1438,7 @@ def handle_iso(iso, device): logging.critical("TODO: /live/image handling not yet implemented - sorry") sys.exit(1) - iso_mountpoint = tempfile.mkdtemp() + iso_mountpoint = tempfile.mkdtemp(prefix="grml2usb") register_tmpfile(iso_mountpoint) remove_iso_mountpoint = True @@ -1393,7 +1459,7 @@ def handle_iso(iso, device): remove_device_mountpoint = False # skip_mbr = True else: - device_mountpoint = tempfile.mkdtemp() + device_mountpoint = tempfile.mkdtemp(prefix="grml2usb") register_tmpfile(device_mountpoint) remove_device_mountpoint = True try: @@ -1416,10 +1482,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): @@ -1427,9 +1497,13 @@ def handle_mbr(device): @device: device where the MBR should be installed to""" + if options.dryrun: + logging.info("Would install MBR") + return 0 + # make sure we have syslinux available if not options.skipmbr: - if not which("syslinux") and not options.copyonly and not options.dryrun: + 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) @@ -1443,10 +1517,10 @@ def handle_mbr(device): if options.syslinuxmbr: handle_syslinux_mbr(mbr_device) else: - if options.mbrmgr: + if options.mbrmenu: 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) + 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) @@ -1487,7 +1561,7 @@ def handle_vfat(device): logging.critical("Execution failed: %s", error) sys.exit(1) - if not check_for_usbdevice(device): + if not check_for_usbdevice(device) and not os.path.isdir(device): print "Warning: the specified device %s does not look like a removable usb device." % device f = raw_input("Do you really want to continue? y/N ") if f == "y" or f == "Y": @@ -1517,14 +1591,17 @@ 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 = "%(asctime)-15s %(message)s" + FORMAT = "Debug: %(asctime)-15s %(message)s" logging.basicConfig(level=logging.DEBUG, format=FORMAT) elif options.quiet: FORMAT = "Critical: %(message)s" logging.basicConfig(level=logging.CRITICAL, format=FORMAT) else: - FORMAT = "Info: %(message)s" + FORMAT = "%(message)s" logging.basicConfig(level=logging.INFO, format=FORMAT) @@ -1536,6 +1613,8 @@ def handle_bootloader(device): # Install bootloader only if not using the --copy-only option if options.copyonly: logging.info("Not installing bootloader and its files as requested via option copyonly.") + elif os.path.isdir(device): + logging.info("Not installing bootloader as %s is a directory." % device) else: install_bootloader(device) @@ -1556,6 +1635,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.") @@ -1563,13 +1644,15 @@ def main(): 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. (BIOS won't support it.)") - sys.exit(1) - else: - logging.critical("Fatal: installation on raw device not supported. (BIOS won't support it.)") - sys.exit(1) + if not os.path.isdir(device): + if device[-1:].isdigit(): + if int(device[-1:]) > 4: + logging.critical("Fatal: installation on partition number >4 not supported. (BIOS won't support it.)") + sys.exit(1) + else: + if os.path.exists(device): + logging.critical("Fatal: installation on raw device not supported. (BIOS won't support it.)") + sys.exit(1) # provide upgrade path handle_compat_warning(device) @@ -1582,7 +1665,8 @@ def main(): handle_iso(iso, device) # install mbr - handle_mbr(device) + if not os.path.isdir(device): + handle_mbr(device) handle_bootloader(device)