X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb.py;h=7411e48f1ab12d7ea6240aa2eb71a9b5fa32641e;hp=3ef8e4218062babb3d19c96add002d02bb357e3c;hb=691a25a0c38dc62ba2c64c93a05a290d7ed26b57;hpb=500ca32b6e7b78dc8ce47ead9ba8f01beb9ff7c2 diff --git a/grml2usb.py b/grml2usb.py index 3ef8e42..7411e48 100755 --- a/grml2usb.py +++ b/grml2usb.py @@ -1,41 +1,52 @@ #!/usr/bin/env python -# Filename: grml2usb -# Purpose: install grml system to usb device -# Authors: grml-team (grml.org), (c) Michael Prokop -# Bug-Reports: see http://grml.org/bugs/ -# License: This file is licensed under the GPL v2 or any later version. -################################################################################ - -# TODO: -# * strongly improve error handling :) -# * implement mount handling -# * write error messages to stderr -# * log wrapper (log important messages to syslog, depending on loglevel -> logging module) -# * trap handling (umount devices when interrupting?) -# * provide progress bar? -# * graphical version? -# * integrate https://www.mirbsd.org/cvs.cgi/src/sys/arch/i386/stand/mbr/mbr.S?rev=HEAD;content-type=text%2Fplain ? -# -> gcc -D_ASM_SOURCE -D__BOOT_VER=\"GRML\" -DBOOTMANAGER -c mbr.S; ld -# -nostdlib -Ttext 0 -N -Bstatic --oformat binary mbr.o -o mbrmgr - -prog_version = "0.0.1" - -import os, re, subprocess, sys +# -*- coding: utf-8 -*- +""" +grml2usb +~~~~~~~~ + +This script installs a grml system to a USB device + +:copyright: (c) 2009 by Michael Prokop +:license: GPL v2 or any later version +:bugreports: http://grml.org/bugs/ + +TODO +---- + +* improve error handling :) +* implement mount handling +* log wrapper (-> logging module) +* implement logic for storing information about copied files + -> register every single file? +* trap handling (like unmount devices when interrupting?) +* get rid of all TODOs in code :) +* graphical version +""" + +import os, re, subprocess, sys, tempfile from optparse import OptionParser from os.path import exists, join, abspath from os import pathsep +# TODO string.split() is deprecated - replace? +# -> http://docs.python.org/library/string.html#deprecated-string-functions from string import split -# cmdline parsing {{{ +PROG_VERSION = "0.0.1" + +# cmdline parsing +# TODO +# * --copy-only? +# * --bootloader-only? usage = "Usage: %prog [options] \n\ \n\ %prog installs a grml ISO to an USB device to be able to boot from it.\n\ Make sure you have at least a grml ISO or a running grml system,\n\ syslinux (just run 'aptitude install syslinux' on Debian-based systems)\n\ and root access." -parser = OptionParser(usage=usage) -parser.add_option("--bootoptions", dest="bootoptions", action="store", type="string", +parser = OptionParser(usage=usage) +parser.add_option("--bootoptions", dest="bootoptions", + action="store", type="string", help="use specified bootoptions as defaut") parser.add_option("--dry-run", dest="dryrun", action="store_true", help="do not actually execute any commands") @@ -59,24 +70,32 @@ parser.add_option("--verbose", dest="verbose", action="store_true", help="enable verbose mode") parser.add_option("-v", "--version", dest="version", action="store_true", help="display version and exit") -# }}} +(options, args) = parser.parse_args() -# wrapper functions {{{ -# TODO: implement argument handling -def execute(command): + +def execute(f, *args): """Wrapper for executing a command. Either really executes the command (default) or when using --dry-run commandline option just displays what would be executed.""" + # demo: execute(subprocess.Popen, (["ls", "-la"])) if options.dryrun: - print "would execute %s now" % command + print "would execute %s(%s) now" % (f, args) else: - # TODO: actual execution ;) - print "executing %s" % command + return f(*args) + + +def is_exe(fpath): + """Check whether a given file can be executed + + @fpath: full path to file + @return:""" + return os.path.exists(fpath) and os.access(fpath, os.X_OK) + def which(program): - def is_exe(fpath): - return os.path.exists(fpath) and os.access(fpath, os.X_OK) + """Check whether a given program is available in PATH + @program: name of executable""" fpath, fname = os.path.split(program) if fpath: if is_exe(program): @@ -89,20 +108,20 @@ def which(program): return None + def search_file(filename, search_path='/bin' + pathsep + '/usr/bin'): - """Given a search path, find file""" - file_found = 0 - paths = split(search_path, pathsep) - for path in paths: - for current_dir, directories, files in os.walk(path): - if exists(join(current_dir, filename)): - file_found = 1 - break - if file_found: - return abspath(join(current_dir, filename)) - else: - return None -# }}} + """Given a search path, find file""" + file_found = 0 + paths = split(search_path, pathsep) + for path in paths: + for current_dir, directories, files in os.walk(path): + if exists(join(current_dir, filename)): + file_found = 1 + break + if file_found: + return abspath(join(current_dir, filename)) + else: + return None def check_uid_root(): @@ -112,14 +131,17 @@ def check_uid_root(): def install_syslinux(device): + # TODO """Install syslinux on specified device.""" print("debug: syslinux %s [TODO]") % device + # syslinux -d boot/isolinux /dev/usb-sdb1 + def generate_grub_config(grml_flavour): """Generate grub configuration for use via menu,lst""" - # TODO: + # TODO # * what about system using grub2 without having grub available? # * support grub2 @@ -145,7 +167,7 @@ initrd /boot/release/%(grml_name)s/initrd.gz def generate_isolinux_splash(grml_flavour): """Generate bootsplash for isolinux/syslinux""" - # TODO: + # TODO # * adjust last bootsplash line grml_name = grml_flavour @@ -160,7 +182,7 @@ Some information and boot options available via keys F2 - F10. http://grml.org/ def generate_syslinux_config(grml_flavour): """Generate configuration for use in syslinux.cfg""" - # TODO: + # TODO # * unify isolinux and syslinux setup ("INCLUDE /boot/...") grml_name = grml_flavour @@ -198,7 +220,8 @@ def install_grub(device): def install_bootloader(partition): """Install bootloader on device.""" - # Install bootloader on the device (/dev/sda), not on the partition itself (/dev/sda1) + # Install bootloader on the device (/dev/sda), + # not on the partition itself (/dev/sda1) if partition[-1:].isdigit(): device = re.match(r'(.*?)\d*$', partition).group(1) else: @@ -210,24 +233,69 @@ def install_bootloader(partition): install_syslinux(device) -def install_mbr(target): - """Install a default master boot record on given target""" - print("TODO") +def is_writeable(device): + """Check if the device is writeable for the current user""" + + if not device: + return False + #raise Exception, "no device for checking write permissions" + + if not os.path.exists(device): + return False + + return os.access(device, os.W_OK) and os.access(device, os.R_OK) + +def install_mbr(device): + """Install a default master boot record on given device + + @device: device where MBR should be installed to""" + + if not is_writeable(device): + raise IOError, "device not writeable for user" + + lilo = './lilo/lilo.static' # FIXME + + if not is_exe(lilo): + raise Exception, "lilo executable not available." + + # to support -A for extended partitions: + print("debug: ./lilo/lilo.static -S /dev/null -M %s ext") % device + proc = subprocess.Popen(["./lilo/lilo.static", "-S", "/dev/null", "-M", device, "ext"]) + proc.wait() + if proc.returncode != 0: + raise Exception, "error executing lilo" + + # activate partition: + print("debug: ./lilo/lilo.static -S /dev/null -A %s 1") % device + proc = subprocess.Popen(["./lilo/lilo.static", "-S", "/dev/null", "-A", device, "1"]) + proc.wait() + if proc.returncode != 0: + raise Exception, "error executing lilo" + + # lilo's mbr is broken, use the one from syslinux instead: + print("debug: cat /usr/lib/syslinux/mbr.bin > %s") % device + try: + # TODO use Popen instead? + retcode = subprocess.call("cat /usr/lib/syslinux/mbr.bin > "+ device, shell=True) + if retcode < 0: + print >> sys.stderr, "Error copying MBR to device", -retcode + except OSError, error: + print >> sys.stderr, "Execution failed:", error - # Command logic (all executed *without* mounted device): - # lilo -S /dev/null -M /dev/usb-sdb ext - # lilo -S /dev/null -A /dev/usb-sdb 1 - # cat /usr/lib/syslinux/mbr.bin > /dev/usb-sdb - # syslinux -d boot/isolinux /dev/usb-sdb1 def loopback_mount(iso, target): - """Loopback mount specified ISO on given target""" + """Loopback mount specified ISO on given target + + @iso: name of ISO that should be mounted + @target: directory where the ISO should be mounted to""" print("mount -o loop %s %s") % (iso, target) def check_for_vat(partition): - """Check whether specified partition is VFAT/FAT16 filesystem""" + """Check whether specified partition is a valid VFAT/FAT16 filesystem + + @partition: device name of partition""" try: udev_info = subprocess.Popen(["/lib/udev/vol_id", "-t", @@ -241,7 +309,8 @@ def check_for_vat(partition): if filesystem != "vfat": return(1) - # TODO: check for ID_FS_VERSION=FAT16 as well? + # TODO + # * check for ID_FS_VERSION=FAT16 as well? except OSError: print("Sorry, /lib/udev/vol_id not available.") @@ -249,17 +318,19 @@ def check_for_vat(partition): def mkdir(directory): """Simple wrapper around os.makedirs to get shell mkdir -p behaviour""" + if not os.path.isdir(directory): try: os.makedirs(directory) except OSError: + # just silently pass as it's just fine it the directory exists pass def copy_grml_files(grml_flavour, iso_mount, target): """Copy files from ISO on given target""" - # TODO: + # TODO # * provide alternative search_file() if file information is stored in a config.ini file? # * catch "install: .. No space left on device" & CO # * abstract copy logic to make the code shorter? @@ -294,10 +365,10 @@ def copy_grml_files(grml_flavour, iso_mount, target): print("debug: copy logo.16 to %s") % isolinux_target + 'logo.16' subprocess.Popen(["install", "--mode=664", logo, isolinux_target + 'logo.16']) - for file in 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9', 'f10': - bootsplash = search_file(file, iso_mount) - print("debug: copy %s to %s") % (bootsplash, isolinux_target + file) - subprocess.Popen(["install", "--mode=664", bootsplash, isolinux_target + file]) + for ffile in 'f2', 'f3', 'f4', 'f5', 'f6', 'f7', 'f8', 'f9', 'f10': + bootsplash = search_file(ffile, iso_mount) + print("debug: copy %s to %s") % (bootsplash, isolinux_target + ffile) + subprocess.Popen(["install", "--mode=664", bootsplash, isolinux_target + ffile]) grub_target = target + '/boot/grub/' mkdir(grub_target) @@ -330,25 +401,31 @@ def copy_grml_files(grml_flavour, iso_mount, target): def uninstall_files(device): """Get rid of all grml files on specified device""" - print("TODO") + # TODO + print("TODO: %s") % device def identify_grml_flavour(mountpath): - """Get name of grml flavour""" + """Get name of grml flavour + + @mountpath: path where the grml ISO is mounted to + @return: name of grml-flavour""" version_file = search_file('grml-version', mountpath) - file = open(version_file, 'r') - grml_info = file.readline() - file.close + + tmpfile = open(version_file, 'r') + grml_info = tmpfile.readline() + #tmpfile.close # pylint: Statement seems to have no effect + grml_flavour = re.match(r'[\w-]*', grml_info).group() return grml_flavour def main(): - (options, args) = parser.parse_args() + """Main function [make pylint happy :)]""" if options.version: - print("%s %s")% (os.path.basename(sys.argv[0]), prog_version) + print("%s %s")% (os.path.basename(sys.argv[0]), PROG_VERSION) sys.exit(0) if len(args) < 2: @@ -360,25 +437,30 @@ def main(): isos = args[0:len(args) - 1] if not which("syslinux"): - print("Sorry, syslinux not available. Exiting.") - print("Please install syslinux or consider using the --grub option.") + print >> sys.stderr, 'Sorry, syslinux not available. Exiting.' + print >> sys.stderr, 'Please install syslinux or consider using the --grub option.' sys.exit(1) - # TODO check for valid blockdevice, vfat and mount functions + # TODO + # * check for valid blockdevice, vfat and mount functions # if device is not None: # check_for_vat(device) # mount_target(partition) - # FIXME - target = '/mnt/usb-sdb1' + # TODO + # target = '/mnt/usb-sdb1' + target = tempfile.mkdtemp() + print("debug: target = %s") % target - # TODO it doesn't need to be a ISO, could be /live/image as well + # TODO + # * it doesn't need to be a ISO, could be /live/image as well for iso in isos: print("debug: iso = %s") % iso # loopback_mount(iso) + iso_mount = '/mnt/test' # FIXME + loopback_mount(iso, target) # FIXME s/target/iso_mount/ # copy_grml_files(iso, target) # loopback_unmount(iso) - iso_mount = '/mnt/test' # FIXME grml_flavour = identify_grml_flavour(iso_mount) print("debug: grml_flavour = %s") % grml_flavour @@ -386,16 +468,30 @@ def main(): grml_flavour_short = grml_flavour.replace('-','') print("debug: grml_flavour_short = %s") % grml_flavour_short - copy_grml_files(grml_flavour, iso_mount, target) - + # TODO - re-enable :) + # copy_grml_files(grml_flavour, iso_mount, target) if options.mbr: - print("debug: would install MBR now") + # make sure we install MBR on /dev/sdX and not /dev/sdX# + if device[-1:].isdigit(): + device = re.match(r'(.*?)\d*$', device).group(1) + + try: + install_mbr(device) + except IOError, error: + print >> sys.stderr, "Execution failed:", error + sys.exit(1) + except Exception, error: + print >> sys.stderr, "Execution failed:", error + sys.exit(1) install_bootloader(device) + if os.path.isdir(target): + os.rmdir(target) + if __name__ == "__main__": main() ## END OF FILE ################################################################# -# vim:foldmethod=marker expandtab ai ft=python tw=120 +# vim:foldmethod=marker expandtab ai ft=python tw=120 fileencoding=utf-8