import datetime, logging, os, re, subprocess, sys, tempfile, time
# global variables
-PROG_VERSION = "0.9.5"
+PROG_VERSION = "0.9.6"
MOUNTED = set() # register mountpoints
TMPFILES = set() # register tmpfiles
DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg
MENU LABEL bsd
KERNEL /boot/addons/bsd4grml/ldbsd.com
+# hardware detection tool
+MENU LABEL hdt
+KERNEL /boot/addons/hdt.c32
+APPEND pciids=/boot/addons/pci.ids
+
## end of global configuration
""" % {'grml_flavour': grml_flavour, 'local_datestamp': local_datestamp, 'bootoptions': bootoptions} )
"--root-directory=%s" % device_mountpoint, device], stdout=file(os.devnull, "r+"))
proc.wait()
if proc.returncode != 0:
- raise Exception("error executing grub-install")
+ # raise Exception("error executing grub-install")
+ logging.critical("Fatal: error executing grub-install (please check the grml2usb FAQ)" % error)
+ cleanup()
+ sys.exit(1)
except CriticalException, error:
logging.critical("Fatal: %s" % error)
cleanup()
squashfs = search_file(grml_flavour + '.squashfs', iso_mount)
if squashfs is None:
logging.critical("Fatal: squashfs file not found")
+ raise CriticalException("error locating squashfs file")
else:
squashfs_target = target + '/live/' + grml_flavour + '/'
execute(mkdir, squashfs_target)
# grub all-in-one image
allinoneimg = search_file('allinone.img', iso_mount)
if allinoneimg is None:
- logging.warn("Warning: allinone.img not found (that's fine if you don't need it")
+ logging.warn("Warning: allinone.img not found (that's fine if you don't need it)")
else:
logging.debug("cp %s %s" % (allinoneimg, addons + '/allinone.img'))
proc = subprocess.Popen(["cp", allinoneimg, addons + 'allinone.img'])
# 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")
+ 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 + '/'])
# 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")
+ 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'])
proc.wait()
+ # install hdt and pci.ids only when using syslinux (grub doesn't support it)
+ if options.syslinux:
+ # hdt (hardware detection tool) image
+ hdtimg = search_file('hdt.c32', iso_mount)
+ if hdtimg:
+ logging.debug("cp %s %s" % (hdtimg, addons + '/hdt.c32'))
+ proc = subprocess.Popen(["cp", hdtimg, addons + '/hdt.c32'])
+ proc.wait()
+
+ # pci.ids file
+ picids = search_file('pci.ids', iso_mount)
+ if picids:
+ logging.debug("cp %s %s" % (picids, addons + '/pci.ids'))
+ proc = subprocess.Popen(["cp", picids, addons + '/pci.ids'])
+ proc.wait()
+
# memdisk image
memdiskimg = search_file('memdisk', iso_mount)
if memdiskimg is None:
- logging.warn("Warning: memdisk not found (that's fine if you don't need it")
+ logging.warn("Warning: memdisk not found (that's fine if you don't need it)")
else:
logging.debug("cp %s %s" % (memdiskimg, addons + '/memdisk'))
proc = subprocess.Popen(["cp", memdiskimg, addons + 'memdisk'])
# 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")
+ 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'])
return 0
elif not options.bootloaderonly:
logging.info("Copying files. This might take a while....")
- copy_system_files(grml_flavour, iso_mount, target)
- copy_grml_files(iso_mount, target)
+ try:
+ copy_system_files(grml_flavour, iso_mount, target)
+ copy_grml_files(iso_mount, target)
+ except CriticalException, error:
+ logging.critical("Execution failed: %s", error)
+ sys.exit(1)
if not options.skipaddons:
if grml_flavour.endswith('-small'):
logging.critical("Fatal: %s" % error)
sys.exit(1)
+def handle_dir(live_image, device):
+ """Main logic for copying files of the currently running grml system.
+
+ @live_image: directory where currently running live system resides (usually /live/image)
+ @device: partition where the specified ISO should be installed to"""
+
+ logging.info("Using %s as install base" % live_image)
+
+ if os.path.isdir(device):
+ logging.info("Specified target is a directory, not mounting therefor.")
+ device_mountpoint = device
+ remove_device_mountpoint = False
+ else:
+ device_mountpoint = tempfile.mkdtemp(prefix="grml2usb")
+ register_tmpfile(device_mountpoint)
+ remove_device_mountpoint = True
+ try:
+ mount(device, device_mountpoint, "")
+ except CriticalException, error:
+ logging.critical("Fatal: %s" % error)
+ cleanup()
+ sys.exit(1)
+
+ try:
+ grml_flavour = identify_grml_flavour(live_image)
+ logging.info("Identified grml flavour \"%s\"." % grml_flavour)
+ install_iso_files(grml_flavour, live_image, device, device_mountpoint)
+ except TypeError:
+ logging.critical("Fatal: a critical error happend during execution (not a grml ISO?), giving up")
+ sys.exit(1)
+ finally:
+ if remove_device_mountpoint:
+ try:
+ unmount(device_mountpoint, "")
+ if os.path.isdir(device_mountpoint):
+ os.rmdir(device_mountpoint)
+ unregister_tmpfile(device_mountpoint)
+ except CriticalException, error:
+ logging.critical("Fatal: %s" % error)
+ cleanup()
+
def handle_iso(iso, device):
"""Main logic for mounting ISOs and copying files.
logging.info("Using ISO %s" % iso)
- if os.path.isdir(iso):
- logging.critical("TODO: /live/image handling not yet implemented - sorry")
- sys.exit(1)
-
iso_mountpoint = tempfile.mkdtemp(prefix="grml2usb")
register_tmpfile(iso_mountpoint)
remove_iso_mountpoint = True
# main operation (like installing files)
for iso in isos:
- handle_iso(iso, device)
+ if os.path.isdir(iso):
+ handle_dir(iso, device)
+ else:
+ handle_iso(iso, device)
# install mbr
if not os.path.isdir(device):