X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=dc1a323abcc2778f70a23b2b97ec9ea4e665efcb;hp=85529c367c1d24b7e31afb9d57c1ec45013769f5;hb=054ed77549abfa175074330c43dd2561b1828e7b;hpb=409f86265e5ba43939c5625971a64d54abae7456 diff --git a/grml2usb b/grml2usb index 85529c3..dc1a323 100755 --- a/grml2usb +++ b/grml2usb @@ -12,13 +12,13 @@ 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 +import datetime, logging, os, re, subprocess, sys, tempfile, time, os.path # global variables -PROG_VERSION = "0.9.8" +PROG_VERSION = "0.9.10" MOUNTED = set() # register mountpoints TMPFILES = set() # register tmpfiles DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg @@ -81,6 +81,10 @@ parser.add_option("-v", "--version", dest="version", action="store_true", help="display version and exit") (options, args) = parser.parse_args() +GRML2USB_BASE = '/usr/share/grml2usb' +if not os.path.isdir(GRML2USB_BASE): + GRML2USB_BASE = os.path.dirname(os.path.realpath(__file__)) + class CriticalException(Exception): """Throw critical exception if the exact error is not known but fatal." @@ -221,7 +225,6 @@ 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 @@ -245,16 +248,20 @@ def generate_main_grub2_config(grml_flavour, bootoptions): return("""\ ## main grub2 configuration - generated by grml2usb [main config generated at: %(local_datestamp)s] set default=0 -set timeout=5 +set timeout=10 insmod fat -if font /boot/grub/ascii.pff ; then +if loadfont /boot/grub/ascii.pf2 ; then insmod png set gfxmode=640x480 insmod gfxterm insmod vbe - terminal gfxterm + if terminal_output.gfxterm ; then true ; else + # For backward compatibility with versions of terminal.mod that don't + # understand terminal_output + terminal gfxterm + fi fi if background_image /boot/grub/grml.png ; then @@ -266,26 +273,35 @@ else fi menuentry "%(grml_flavour)s (default)" { - 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 + set gfxpayload=1024x768x16,1024x768 + linux /boot/release/%(grml_flavour)s/linux26 apm=power-off quiet boot=live nomce live-media-path=/live/%(grml_flavour)s/ %(bootoptions)s initrd /boot/release/%(grml_flavour)s/initrd.gz } menuentry "Memory test (memtest86+)" { - linux /boot/addons/memtest + linux16 /boot/addons/memtest } -menuentry "Grub - all in one image" { +menuentry "Boot Grub (all in one image)" { linux /boot/addons/memdisk initrd /boot/addons/allinone.img } -menuentry "FreeDOS" { +menuentry "Boot FreeDOS" { linux /boot/addons/memdisk initrd /boot/addons/balder10.imz } -menuentry "MirOS BSD" { - multiboot /boot/addons/bsd4grml/ldbsd.com +menuentry "Boot MirOS bsd4grml" { + multiboot /boot/addons/bsd4grml/ldbsd.com + module /boot/addons/bsd4grml/bsd.rd + module /boot/addons/bsd4grml/boot.1 + module /boot/addons/bsd4grml/boot.2 + module /boot/addons/bsd4grml/boot.3 + module /boot/addons/bsd4grml/boot.4 + module /boot/addons/bsd4grml/boot.5 + module /boot/addons/bsd4grml/boot.6 + module /boot/addons/bsd4grml/boot.cfg } menuentry "Boot OS of first partition on first disk" { @@ -307,56 +323,56 @@ def generate_flavour_specific_grub2_config(grml_flavour, bootoptions): return("""\ ## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] -menuentry "%(grml_flavour)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 +menuentry "%(grml_flavour)s - boot in default mode" { + set gfxpayload=1024x768x16,1024x768 + linux /boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ %(bootoptions)s initrd /boot/release/%(grml_flavour)s/initrd.gz } ## 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 +menuentry "%(grml_flavour)s-persistent - enable persistency feature" { + set gfxpayload=1024x768x16,1024x768 + linux /boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet persistent live-media-path=/live/%(grml_flavour)s/ %(bootoptions)s initrd /boot/release/%(grml_flavour)s/initrd.gz } ## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] -menuentry "%(grml_flavour)s2ram" { - 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 +menuentry "%(grml_flavour)s2ram - copy compressed grml file to RAM" { + set gfxpayload=1024x768x16,1024x768 + linux /boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ toram=%(grml_flavour)s.squashfs %(bootoptions)s initrd /boot/release/%(grml_flavour)s/initrd.gz } ## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] -menuentry "%(grml_flavour)s-debug" { - 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 +menuentry "%(grml_flavour)s-debug - enable debugging options" { + set gfxpayload=1024x768x16,1024x768 + linux /boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ debug 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" { - 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 +menuentry "%(grml_flavour)s-x - start X Window System" { + set gfxpayload=1024x768x16,1024x768 + linux /boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ startx=wm-ng %(bootoptions)s initrd /boot/release/%(grml_flavour)s/initrd.gz } ## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] -menuentry "%(grml_flavour)s-nofb" { +menuentry "%(grml_flavour)s-nofb - disable framebuffer" { linux /boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ vga=normal video=ofonly %(bootoptions)s initrd /boot/release/%(grml_flavour)s/initrd.gz } ## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] -menuentry "%(grml_flavour)s-failsafe" { - 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" { - 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 +menuentry "%(grml_flavour)s-failsafe - disable hardware detection" { + linux /boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ vga=normal 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 pci=nomsi %(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" { - 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 +menuentry "%(grml_flavour)s-forensic - do not touch harddisks during hw recognition" { + set gfxpayload=1024x768x16,1024x768 + linux /boot/release/%(grml_flavour)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ nofstab noraid nolvm noautoconfig noswap raid=noautodetect forensic readonly %(bootoptions)s initrd /boot/release/%(grml_flavour)s/initrd.gz } @@ -406,7 +422,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-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 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 +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 pci=nomsi %(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] @@ -586,7 +602,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-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 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 +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 pci=nomsi %(bootoptions)s # flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] LABEL %(grml_flavour)s-forensic @@ -612,20 +628,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)") + 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 or use --syslinux)") + 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, "") @@ -648,7 +665,7 @@ def install_syslinux(device): proc = subprocess.Popen(["syslinux", "-d", "boot/syslinux", device]) proc.wait() if proc.returncode != 0: - raise CriticalException("Error executing syslinux (either try --fat16 or --grub?)") + raise CriticalException("Error executing syslinux (either try --fat16 or use grub?)") def install_bootloader(device): @@ -705,6 +722,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") @@ -819,9 +840,9 @@ def handle_syslinux_mbr(device): # otherwise fall back to our static version from platform import architecture if architecture()[0] == '64bit': - lilo = '/usr/share/grml2usb/lilo/lilo.static.amd64' + lilo = GRML2USB_BASE + '/lilo/lilo.static.amd64' else: - lilo = '/usr/share/grml2usb/lilo/lilo.static.i386' + lilo = GRML2USB_BASE + '/lilo/lilo.static.i386' # finally prefer a specified lilo executable if options.lilobin: lilo = options.lilobin @@ -867,7 +888,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)) @@ -975,16 +996,16 @@ def copy_system_files(grml_flavour, iso_mount, target): else: squashfs_target = target + '/live/' + grml_flavour + '/' execute(mkdir, squashfs_target) - logging.debug("rsync -aHS %s %s" % (squashfs, squashfs_target + grml_flavour + '.squashfs')) - proc = subprocess.Popen(["rsync", "-aHS", 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("rsync -aHS %s %s" % (filesystem_module, squashfs_target + 'filesystem.module')) - proc = subprocess.Popen(["rsync", "-aHS", 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 @@ -994,16 +1015,16 @@ def copy_system_files(grml_flavour, iso_mount, target): if kernel is None: logging.critical("Fatal kernel not found") else: - logging.debug("rsync -aHS %s %s" % (kernel, release_target + '/linux26')) - proc = subprocess.Popen(["rsync", "-aHS", 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("rsync -aHS %s %s" % (initrd, release_target + '/initrd.gz')) - proc = subprocess.Popen(["rsync", "-aHS", 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() @@ -1021,8 +1042,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("rsync -aHS %s %s" % (grml_file, grml_target + grml_file)) - proc = subprocess.Popen(["rsync", "-aHS", 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/' @@ -1033,8 +1054,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("rsync -aHS %s %s" % (grml_file, grml_web_target + grml_file)) - proc = subprocess.Popen(["rsync", "-aHS", 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/' @@ -1045,8 +1066,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("rsync -aHS %s %s" % (grml_file, grml_webimg_target + grml_file)) - proc = subprocess.Popen(["rsync", "-aHS", 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() @@ -1064,8 +1085,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("rsync -aHS %s %s" % (allinoneimg, addons + '/allinone.img')) - proc = subprocess.Popen(["rsync", "-aHS", 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 @@ -1073,8 +1094,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("rsync -aHS %s %s" % (bsdimg, addons + '/')) - proc = subprocess.Popen(["rsync", "-aHS", bsdimg, addons + '/']) + logging.debug("rsync -rlptDH --inplace %s %s" % (bsdimg, addons + '/')) + proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", bsdimg, addons + '/']) proc.wait() # freedos image @@ -1082,8 +1103,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("rsync -aHS %s %s" % (balderimg, addons + '/balder10.imz')) - proc = subprocess.Popen(["rsync", "-aHS", 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) @@ -1091,15 +1112,15 @@ def copy_addons(iso_mount, target): # 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']) + 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("rsync -aHS %s %s" % (picids, addons + '/pci.ids')) - proc = subprocess.Popen(["rsync", "-aHS", 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 @@ -1107,8 +1128,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("rsync -aHS %s %s" % (memdiskimg, addons + '/memdisk')) - proc = subprocess.Popen(["rsync", "-aHS", 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 @@ -1116,8 +1137,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("rsync -aHS %s %s" % (memtestimg, addons + '/memtest')) - proc = subprocess.Popen(["rsync", "-aHS", memtestimg, addons + 'memtest']) + logging.debug("rsync -rlptDH --inplace %s %s" % (memtestimg, addons + '/memtest')) + proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", memtestimg, addons + 'memtest']) proc.wait() @@ -1131,41 +1152,41 @@ def copy_bootloader_files(iso_mount, target): execute(mkdir, syslinux_target) logo = search_file('logo.16', iso_mount) - logging.debug("rsync -aHS %s %s" % (logo, syslinux_target + 'logo.16')) - proc = subprocess.Popen(["rsync", "-aHS", 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("rsync -aHS %s %s" % (bootsplash, syslinux_target + ffile)) - proc = subprocess.Popen(["rsync", "-aHS", 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/' execute(mkdir, grub_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.") + if not os.path.isfile(GRML2USB_BASE + "/grub/splash.xpm.gz"): + logging.critical("Error: %s/grub/splash.xpm.gz can not be read." % (GRML2USB_BASE, )) logging.critical("Please make sure you've the grml2usb Debian package installed!") raise else: - 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', + logging.debug("rsync -rlptDH --inplace %s/grub/splash.xpm.gz %s%s" % (GRML2USB_BASE, grub_target, 'splash.xpm.gz')) + proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", GRML2USB_BASE + '/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("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', + if os.path.isfile(GRML2USB_BASE + "/grub/grml.png"): + logging.debug("rsync -rlptDH --inplace %s/grub/grml.png to %s%s" % (GRML2USB_BASE, grub_target, 'grml.png')) + proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", GRML2USB_BASE + '/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("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']) + if os.path.isfile("/usr/share/grub/ascii.pf2"): + logging.debug("rsync -rlptDH --inplace /usr/share/grub/ascii.pf2 to %s" % grub_target + 'ascii.pf2') + proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", '/usr/share/grub/ascii.pf2', + grub_target + 'ascii.pf2']) proc.wait() @@ -1195,14 +1216,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 @@ -1282,6 +1303,14 @@ def handle_grub1_config(grml_flavour, install_partition, grub_target, bootopt): grub1_config_file.write(generate_flavour_specific_grub1_config(grml_flavour, install_partition, bootopt)) grub1_config_file.close() + # make sure grub.conf isn't a symlink but a plain file instead, + # otherwise it will break on FAT16 filesystems + # this works around grub-install of (at least) Fedora 10 + if os.path.isfile(grub1_cfg): + grubconf = grub_target + 'grub.conf' + if not os.path.islink(grubconf): + import shutil + shutil.copyfile(grub1_cfg, grub_target + 'grub.conf') def handle_grub2_config(grml_flavour, grub_target, bootopt): """Main handler for generating grub2 configuration @@ -1344,11 +1373,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 + 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: @@ -1457,7 +1488,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: @@ -1472,12 +1503,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: @@ -1514,7 +1546,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 @@ -1530,12 +1562,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, "") @@ -1561,19 +1594,13 @@ def handle_mbr(device): logging.info("Would install MBR") return 0 - # make sure we have syslinux available - 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 we get e.g. /dev/loop1 as device we don't want to put the MBR - # into /dev/loop of course, therefor use /dev/loop1 as mbr_device + # 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) @@ -1584,9 +1611,9 @@ def handle_mbr(device): 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) + install_mir_mbr(GRML2USB_BASE + '/mbr/mbrmgr', mbr_device, partition_number, True) else: - install_mir_mbr('/usr/share/grml2usb/mbr/mbrldr', mbr_device, partition_number, False) + install_mir_mbr(GRML2USB_BASE + '/mbr/mbrldr', mbr_device, partition_number, False) except IOError, error: logging.critical("Execution failed: %s", error) sys.exit(1) @@ -1601,16 +1628,24 @@ def handle_vfat(device): @device: device that should checked / formated""" # make sure we have mkfs.vfat available - if options.fat16 and not options.force: + if options.fat16: if not which("mkfs.vfat") and not options.copyonly and not options.dryrun: logging.critical('Sorry, mkfs.vfat not available. Exiting.') logging.critical('Please make sure to install dosfstools.') sys.exit(1) - # make sure the user is aware of what he is doing - f = raw_input("Are you sure you want to format the specified partition with fat16? y/N ") - if f == "y" or f == "Y": - logging.info("Note: you can skip this question using the option --force") + exec_mkfs = False + if options.force: + print "Forcing mkfs.fat16 on %s as requested via option --force." % device + exec_mkfs = True + else: + # make sure the user is aware of what he is doing + f = raw_input("Are you sure you want to format the specified partition with fat16? y/N ") + if f == "y" or f == "Y": + logging.info("Note: you can skip this question using the option --force") + exec_mkfs = True + + if exec_mkfs: try: mkfs_fat16(device) except CriticalException, error: @@ -1627,7 +1662,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":