X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=fd6dc17865327fb987d146ebb1aab7d38edb1b44;hp=8aac683a344019efa158ce4e8a5a437aba14acfc;hb=841e2863675db51439233305f8d9cef92c0d5a11;hpb=83c3b4312743dc2801b519e10e6ad630349ec39c

diff --git a/grml2usb b/grml2usb
index 8aac683..fd6dc17 100755
--- a/grml2usb
+++ b/grml2usb
@@ -12,16 +12,18 @@ This script installs a grml system (either a running system or ISO[s]) to a USB
 
 """
 
-from __future__ import with_statement
+# from __future__ import with_statement
 from optparse import OptionParser
 from inspect import isroutine, isclass
 import datetime, logging, os, re, subprocess, sys, tempfile, time
 
 # global variables
-PROG_VERSION = "0.9.7"
+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]> </dev/sdX#>\n\
@@ -59,8 +61,12 @@ 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,30 +266,25 @@ else
 fi
 
 menuentry "%(grml_flavour)s (default)" {
-    set root=(hd0,%(install_partition)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 "MirOS BSD" {
-    set root=(hd0,%(install_partition)s)
     multiboot   /boot/addons/bsd4grml/ldbsd.com
 }
 
@@ -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,69 +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" {
-    set root=(hd0,%(install_partition)s)
     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.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 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 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 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 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 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 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):
@@ -421,7 +411,7 @@ 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]
@@ -601,7 +591,7 @@ 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-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
@@ -622,20 +612,21 @@ def install_grub(device):
         device_mountpoint = tempfile.mkdtemp(prefix="grml2usb")
         register_tmpfile(device_mountpoint)
         try:
-            mount(device, device_mountpoint, "")
-            logging.debug("grub-install --recheck --no-floppy --root-directory=%s %s", device_mountpoint, device)
-            proc = subprocess.Popen(["grub-install", "--recheck", "--no-floppy",
-                "--root-directory=%s" % device_mountpoint, device], stdout=file(os.devnull, "r+"))
-            proc.wait()
-            if proc.returncode != 0:
-                # raise Exception("error executing grub-install")
-                logging.critical("Fatal: error executing grub-install (please check the grml2usb FAQ)" % error)
+            try:
+                mount(device, device_mountpoint, "")
+                logging.debug("grub-install --recheck --no-floppy --root-directory=%s %s", device_mountpoint, device)
+                proc = subprocess.Popen(["grub-install", "--recheck", "--no-floppy",
+                    "--root-directory=%s" % device_mountpoint, device], stdout=file(os.devnull, "r+"))
+                proc.wait()
+                if proc.returncode != 0:
+                    # 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()
                 sys.exit(1)
-        except CriticalException, error:
-            logging.critical("Fatal: %s" % error)
-            cleanup()
-            sys.exit(1)
 
         finally:
             unmount(device_mountpoint, "")
@@ -675,12 +666,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):
@@ -710,6 +706,10 @@ def install_syslinux_mbr(device):
 
     @device: device where MBR of syslinux should be installed to"""
 
+    # make sure we have syslinux available
+    if not which("syslinux") and not options.copyonly:
+        raise Exception("syslinux not available (either install it or consider dropping the --syslinux option)")
+
     # lilo's mbr is broken, use the one from syslinux instead:
     if not os.path.isfile("/usr/lib/syslinux/mbr.bin"):
         raise Exception("/usr/lib/syslinux/mbr.bin can not be read")
@@ -872,7 +872,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))
@@ -922,8 +922,8 @@ def check_for_usbdevice(device):
     # 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')
+        # 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()
@@ -939,7 +939,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()
 
@@ -951,7 +951,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):
@@ -980,16 +980,16 @@ def copy_system_files(grml_flavour, iso_mount, target):
     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 -rlptDH --inplace %s %s" % (squashfs, squashfs_target + grml_flavour + '.squashfs'))
+        proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", 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 -rlptDH --inplace %s %s" % (filesystem_module, squashfs_target + 'filesystem.module'))
+        proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", filesystem_module, squashfs_target + 'filesystem.module'])
         proc.wait()
 
     release_target = target + '/boot/release/' + grml_flavour
@@ -999,16 +999,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 -rlptDH --inplace %s %s" % (kernel, release_target + '/linux26'))
+        proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", 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 -rlptDH --inplace %s %s" % (initrd, release_target + '/initrd.gz'))
+        proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", initrd, release_target + '/initrd.gz'])
         proc.wait()
 
 
@@ -1026,8 +1026,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 -rlptDH --inplace %s %s" % (grml_file, grml_target + grml_file))
+            proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", grml_file, grml_target + myfile])
             proc.wait()
 
     grml_web_target = grml_target + '/web/'
@@ -1038,8 +1038,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 -rlptDH --inplace %s %s" % (grml_file, grml_web_target + grml_file))
+            proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", grml_file, grml_web_target + myfile])
             proc.wait()
 
     grml_webimg_target = grml_web_target + '/images/'
@@ -1050,8 +1050,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 -rlptDH --inplace %s %s" % (grml_file, grml_webimg_target + grml_file))
+            proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", grml_file, grml_webimg_target + myfile])
             proc.wait()
 
 
@@ -1069,8 +1069,8 @@ def copy_addons(iso_mount, target):
     if allinoneimg is None:
         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 -rlptDH --inplace %s %s" % (allinoneimg, addons + '/allinone.img'))
+        proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", allinoneimg, addons + 'allinone.img'])
         proc.wait()
 
     # bsd imag
@@ -1078,8 +1078,8 @@ def copy_addons(iso_mount, target):
     if bsdimg is None:
         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 -rlptDH --inplace %s %s" % (bsdimg, addons + '/'))
+        proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", bsdimg, addons + '/'])
         proc.wait()
 
     # freedos image
@@ -1087,8 +1087,8 @@ def copy_addons(iso_mount, target):
     if balderimg is None:
         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 -rlptDH --inplace %s %s" % (balderimg, addons + '/balder10.imz'))
+        proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", balderimg, addons + 'balder10.imz'])
         proc.wait()
 
     # install hdt and pci.ids only when using syslinux (grub doesn't support it)
@@ -1096,15 +1096,15 @@ def copy_addons(iso_mount, target):
         # 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'])
+            logging.debug("rsync -rlptDH --inplace %s %s" % (hdtimg, addons + '/hdt.c32'))
+            proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", 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'])
+            logging.debug("rsync -rlptDH --inplace %s %s" % (picids, addons + '/pci.ids'))
+            proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", picids, addons + '/pci.ids'])
             proc.wait()
 
     # memdisk image
@@ -1112,8 +1112,8 @@ def copy_addons(iso_mount, target):
     if memdiskimg is None:
         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 -rlptDH --inplace %s %s" % (memdiskimg, addons + '/memdisk'))
+        proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", memdiskimg, addons + 'memdisk'])
         proc.wait()
 
     # memtest86+ image
@@ -1121,8 +1121,8 @@ def copy_addons(iso_mount, target):
     if memtestimg is None:
         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 -rlptDH --inplace %s %s" % (memtestimg, addons + '/memtest'))
+        proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", memtestimg, addons + 'memtest'])
         proc.wait()
 
 
@@ -1136,14 +1136,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 -rlptDH --inplace %s %s" % (logo, syslinux_target + 'logo.16'))
+    proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", 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 -rlptDH --inplace %s %s" % (bootsplash, syslinux_target + ffile))
+        proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", bootsplash, syslinux_target + ffile])
         proc.wait()
 
     grub_target = target + '/boot/grub/'
@@ -1154,22 +1154,22 @@ def copy_bootloader_files(iso_mount, target):
         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 -rlptDH --inplace /usr/share/grml2usb/grub/splash.xpm.gz %s" % grub_target + 'splash.xpm.gz')
+        proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", '/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 -rlptDH --inplace /usr/share/grml2usb/grub/grml.png to %s" % grub_target + 'grml.png')
+        proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", '/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 -rlptDH --inplace /usr/share/grub/ascii.pff to %s" % grub_target + 'ascii.pff')
+        proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", '/usr/share/grub/ascii.pff',
                                 grub_target + 'ascii.pff'])
         proc.wait()
 
@@ -1200,14 +1200,14 @@ def install_iso_files(grml_flavour, iso_mount, device, target):
 
     if not options.skipaddons:
         if grml_flavour.endswith('-small'):
-            logging.info("Note: 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
@@ -1288,11 +1288,10 @@ def handle_grub1_config(grml_flavour, install_partition, grub_target, bootopt):
         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"""
 
@@ -1300,6 +1299,8 @@ 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):
@@ -1307,15 +1308,15 @@ def handle_grub2_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):
             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)
+        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()
 
     # install flavour specific configuration only *once* as well
@@ -1331,8 +1332,8 @@ 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))
+            GRML_FLAVOURS.add(grml_flavour)
+        grub2_config_file.write(generate_flavour_specific_grub2_config(grml_flavour, bootopt))
         grub2_config_file.close()
 
 
@@ -1348,12 +1349,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:
@@ -1362,9 +1364,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):
@@ -1379,12 +1382,14 @@ 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):
@@ -1392,13 +1397,13 @@ def handle_syslinux_config(grml_flavour, target):
         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')
-        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()
@@ -1416,7 +1421,7 @@ def handle_syslinux_config(grml_flavour, target):
         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))
+            GRML_FLAVOURS.add(grml_flavour)
         syslinux_config_file.write(generate_flavour_specific_syslinux_config(grml_flavour, bootopt))
         syslinux_config_file.close()
 
@@ -1433,8 +1438,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)
@@ -1451,7 +1465,7 @@ def handle_dir(live_image, device):
     logging.info("Using %s as install base" % live_image)
 
     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
     else:
@@ -1466,12 +1480,13 @@ def handle_dir(live_image, device):
             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)
+        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:
@@ -1508,7 +1523,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
@@ -1524,12 +1539,13 @@ def handle_iso(iso, device):
             sys.exit(1)
 
     try:
-        grml_flavour = identify_grml_flavour(iso_mountpoint)
-        logging.info("Identified grml flavour \"%s\"." % grml_flavour)
-        install_iso_files(grml_flavour, iso_mountpoint, device, device_mountpoint)
-    except TypeError:
-        logging.critical("Fatal: a critical error happend during execution (not a grml ISO?), giving up")
-        sys.exit(1)
+        try:
+            grml_flavour = identify_grml_flavour(iso_mountpoint)
+            logging.info("Identified grml flavour \"%s\"." % grml_flavour)
+            install_iso_files(grml_flavour, iso_mountpoint, device, device_mountpoint)
+        except TypeError:
+            logging.critical("Fatal: a critical error happend during execution (not a grml ISO?), giving up")
+            sys.exit(1)
     finally:
         if os.path.isdir(iso_mountpoint) and remove_iso_mountpoint:
             unmount(iso_mountpoint, "")
@@ -1555,32 +1571,32 @@ def handle_mbr(device):
         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:
-            logging.critical('Sorry, syslinux not available. Exiting.')
-            logging.critical('Please install syslinux or consider using the --grub option.')
-            sys.exit(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
 
-    if not options.skipmbr:
-        if device[-1:].isdigit():
-            mbr_device = re.match(r'(.*?)\d*$', device).group(1)
-            partition_number = int(device[-1:]) - 1
+    # 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)
+    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.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, 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)
+                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):
@@ -1615,7 +1631,7 @@ def handle_vfat(device):
             logging.critical("Execution failed: %s", error)
             sys.exit(1)
 
-    if not check_for_usbdevice(device) and not os.path.isdir(device):
+    if not os.path.isdir(device) and not check_for_usbdevice(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":
@@ -1700,14 +1716,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)
 
@@ -1723,10 +1743,16 @@ def main():
 
     # 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)