"""
-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.11"
MOUNTED = set() # register mountpoints
TMPFILES = set() # register tmpfiles
DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg
help="format specified partition with FAT16")
parser.add_option("--force", dest="force", action="store_true",
help="force any actions requiring manual interaction")
-#parser.add_option("--initrd", dest="initrd", action="store", type="string",
-# help="install specified initrd instead of the default [TODO - not implemented yet]")
-#parser.add_option("--kernel", dest="kernel", action="store", type="string",
-# help="install specified kernel instead of the default [TODO - not implemented yet]")
+parser.add_option("--grub-mbr", dest="grubmbr", action="store_true",
+ help="install grub into MBR instead of (default) PBR")
parser.add_option("--lilo-binary", dest="lilobin", action="store", type="string",
help="lilo executable to be used for installing MBR")
parser.add_option("--mbr-menu", dest="mbrmenu", action="store_true",
help="install syslinux bootloader instead of grub")
parser.add_option("--syslinux-mbr", dest="syslinuxmbr", action="store_true",
help="install syslinux master boot record (MBR) instead of default")
-#parser.add_option("--squashfs", dest="squashfs", action="store", type="string",
-# help="install specified squashfs file instead of the default [TODO - not implemented yet]")
-#parser.add_option("--uninstall", dest="uninstall", action="store_true",
-# help="remove grml ISO files from specified device [TODO - not implemented yet]")
parser.add_option("--verbose", dest="verbose", action="store_true",
help="enable verbose mode")
parser.add_option("-v", "--version", dest="version", action="store_true",
(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."
@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
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
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" {
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
}
## 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]
# 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
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, "")
+
+ # If using --grub-mbr then make sure we install grub in MBR instead of PBR
+ # Thanks to grub2. NOT.
+ if options.grubmbr:
+ logging.debug("Using option --grub-mbr ...")
+ if device[-1:].isdigit():
+ grub_device = re.match(r'(.*?)\d*$', device).group(1)
+ else:
+ grub_device = device
+ else:
+ grub_device = device
+
+ logging.debug("grub-install --recheck --no-floppy --root-directory=%s %s",
+ device_mountpoint, grub_device)
+ proc = subprocess.Popen(["grub-install", "--recheck", "--no-floppy",
+ "--root-directory=%s" % device_mountpoint, grub_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)")
+ logging.critical("Note: if using grub2 consider using the --grub-mbr option because grub2's PBR feature is broken.")
+ 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, "")
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):
# 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
pass
+def exec_rsync(source, target):
+ """Simple wrapper around rsync to install files
+
+ @source: source file/directory
+ @target: target file/directory"""
+ logging.debug(source, target)
+ proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", source, target])
+ proc.wait()
+ if proc.returncode == 12:
+ logging.critical("Fatal: No space left on device")
+ cleanup()
+ sys.exit(1)
+
+ if proc.returncode != 0:
+ logging.critical("Fatal: could not install %s" % source)
+ cleanup()
+ sys.exit(1)
+
+
def copy_system_files(grml_flavour, iso_mount, target):
"""copy grml's main files (like squashfs, kernel and initrd) to a given target
else:
squashfs_target = target + '/live/' + grml_flavour + '/'
execute(mkdir, squashfs_target)
- 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()
+ exec_rsync(squashfs, squashfs_target + grml_flavour + '.squashfs')
filesystem_module = search_file('filesystem.module', iso_mount)
if filesystem_module is None:
logging.critical("Fatal: filesystem.module not found")
else:
- 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()
+ exec_rsync(filesystem_module, squashfs_target + 'filesystem.module')
release_target = target + '/boot/release/' + grml_flavour
execute(mkdir, release_target)
if kernel is None:
logging.critical("Fatal kernel not found")
else:
- logging.debug("rsync -rlptDH --inplace %s %s" % (kernel, release_target + '/linux26'))
- proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", kernel, release_target + '/linux26'])
- proc.wait()
+ exec_rsync(kernel, release_target + '/linux26')
initrd = search_file('initrd.gz', iso_mount)
if initrd is None:
logging.critical("Fatal: initrd not found")
else:
- 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()
+ exec_rsync(initrd, release_target + '/initrd.gz')
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 -rlptDH --inplace %s %s" % (grml_file, grml_target + grml_file))
- proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", grml_file, grml_target + myfile])
- proc.wait()
+ exec_rsync(grml_file, grml_target + myfile)
grml_web_target = grml_target + '/web/'
execute(mkdir, grml_web_target)
if grml_file is None:
logging.warn("Warning: myfile %s could not be found - can not install it")
else:
- 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()
+ exec_rsync(grml_file, grml_web_target + myfile)
grml_webimg_target = grml_web_target + '/images/'
execute(mkdir, grml_webimg_target)
if grml_file is None:
logging.warn("Warning: myfile %s could not be found - can not install it")
else:
- 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()
+ exec_rsync(grml_file, grml_webimg_target + myfile)
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 -rlptDH --inplace %s %s" % (allinoneimg, addons + '/allinone.img'))
- proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", allinoneimg, addons + 'allinone.img'])
- proc.wait()
+ exec_rsync(allinoneimg, addons + 'allinone.img')
# bsd imag
bsdimg = search_file('bsd4grml', iso_mount)
if bsdimg is None:
logging.warn("Warning: bsd4grml not found (that's fine if you don't need it)")
else:
- logging.debug("rsync -rlptDH --inplace %s %s" % (bsdimg, addons + '/'))
- proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", bsdimg, addons + '/'])
- proc.wait()
+ exec_rsync(bsdimg, addons + '/')
# freedos image
balderimg = search_file('balder10.imz', iso_mount)
if balderimg is None:
logging.warn("Warning: balder10.imz not found (that's fine if you don't need it)")
else:
- logging.debug("rsync -rlptDH --inplace %s %s" % (balderimg, addons + '/balder10.imz'))
- proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", balderimg, addons + 'balder10.imz'])
- proc.wait()
+ exec_rsync(balderimg, addons + 'balder10.imz')
# install hdt and pci.ids only when using syslinux (grub doesn't support it)
if options.syslinux:
# hdt (hardware detection tool) image
hdtimg = search_file('hdt.c32', iso_mount)
if hdtimg:
- logging.debug("rsync -rlptDH --inplace %s %s" % (hdtimg, addons + '/hdt.c32'))
- proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", hdtimg, addons + '/hdt.c32'])
- proc.wait()
+ exec_rsync(hdtimg, addons + '/hdt.c32')
# pci.ids file
picids = search_file('pci.ids', iso_mount)
if picids:
- logging.debug("rsync -rlptDH --inplace %s %s" % (picids, addons + '/pci.ids'))
- proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", picids, addons + '/pci.ids'])
- proc.wait()
+ exec_rsync(picids, addons + '/pci.ids')
# memdisk image
memdiskimg = search_file('memdisk', iso_mount)
if memdiskimg is None:
logging.warn("Warning: memdisk not found (that's fine if you don't need it)")
else:
- logging.debug("rsync -rlptDH --inplace %s %s" % (memdiskimg, addons + '/memdisk'))
- proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", memdiskimg, addons + 'memdisk'])
- proc.wait()
+ exec_rsync(memdiskimg, addons + 'memdisk')
# memtest86+ image
memtestimg = search_file('memtest', iso_mount)
if memtestimg is None:
logging.warn("Warning: memtest not found (that's fine if you don't need it)")
else:
- logging.debug("rsync -rlptDH --inplace %s %s" % (memtestimg, addons + '/memtest'))
- proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", memtestimg, addons + 'memtest'])
- proc.wait()
+ exec_rsync(memtestimg, addons + 'memtest')
def copy_bootloader_files(iso_mount, target):
execute(mkdir, syslinux_target)
logo = search_file('logo.16', iso_mount)
- 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()
+ exec_rsync(logo, syslinux_target + 'logo.16')
for ffile in 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9', 'f10':
bootsplash = search_file(ffile, iso_mount)
- logging.debug("rsync -rlptDH --inplace %s %s" % (bootsplash, syslinux_target + ffile))
- proc = subprocess.Popen(["rsync", "-rlptDH", "--inplace", bootsplash, syslinux_target + ffile])
- proc.wait()
+ exec_rsync(bootsplash, syslinux_target + ffile)
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 -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()
+ exec_rsync(GRML2USB_BASE + '/grub/splash.xpm.gz', grub_target + 'splash.xpm.gz')
# grml splash in grub
- if os.path.isfile("/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()
+ if os.path.isfile(GRML2USB_BASE + "/grub/grml.png"):
+ exec_rsync(GRML2USB_BASE + '/grub/grml.png', grub_target + 'grml.png')
# font file for graphical bootsplash in grub
- if os.path.isfile("/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()
-
+ if os.path.isfile("/usr/share/grub/ascii.pf2"):
+ exec_rsync('/usr/share/grub/ascii.pf2', grub_target + 'ascii.pf2')
def install_iso_files(grml_flavour, iso_mount, device, target):
"""Copy files from ISO to given target
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
bootopt = options.bootoptions
# write menu.lst
- if install_grub1_partition:
- handle_grub1_config(grml_flavour, install_grub1_partition, grub_target, bootopt)
+ handle_grub1_config(grml_flavour, install_grub1_partition, grub_target, bootopt)
# write grub.cfg
handle_grub2_config(grml_flavour, grub_target, bootopt)
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:
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, "")
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)
@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:
projects / grml2usb.git / blobdiff