X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=86f05678b12586026caf0ec8bd5488154ff8e733;hp=1aa39bad4fdb204ec4af2b1de4e52e0d319a08f4;hb=fc906afbdc63fe9f11cf64186a61aac0c547edc5;hpb=b2e01dffb74a3870b3c54528ec01389cb1b9f6bb diff --git a/grml2usb b/grml2usb index 1aa39ba..86f0567 100755 --- a/grml2usb +++ b/grml2usb @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python2.6 # -*- coding: utf-8 -*- """ grml2usb @@ -18,7 +18,7 @@ from inspect import isroutine, isclass import datetime, logging, os, re, subprocess, sys, tempfile, time, os.path # global variables -PROG_VERSION = "0.9.10" +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 @@ -51,10 +51,6 @@ parser.add_option("--force", dest="force", action="store_true", help="force any actions requiring manual interaction") parser.add_option("--grub-mbr", dest="grubmbr", action="store_true", help="install grub into MBR instead of (default) PBR") -#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("--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", @@ -73,16 +69,13 @@ 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", 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", 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__)) @@ -165,7 +158,7 @@ def execute(f, *exec_arguments): # TODO: doesn't work for proc = execute(subprocess.Popen...() -> any ideas? if options.dryrun: # pylint: disable-msg=W0141 - logging.debug('dry-run only: %s(%s)' % (get_function_name(f), ', '.join(map(repr, exec_arguments)))) + logging.debug('dry-run only: %s(%s)', get_function_name(f), ', '.join(map(repr, exec_arguments))) else: # pylint: disable-msg=W0142 return f(*exec_arguments) @@ -232,7 +225,7 @@ def mkfs_fat16(device): return 0 logging.info("Formating partition with fat16 filesystem") - logging.debug("mkfs.vfat -F 16 %s" % device) + logging.debug("mkfs.vfat -F 16 %s", device) proc = subprocess.Popen(["mkfs.vfat", "-F", "16", device]) proc.wait() if proc.returncode != 0: @@ -644,7 +637,8 @@ def install_grub(device): else: grub_device = device - logging.debug("grub-install --recheck --no-floppy --root-directory=%s %s", device_mountpoint, grub_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() @@ -655,7 +649,7 @@ def install_grub(device): cleanup() sys.exit(1) except CriticalException, error: - logging.critical("Fatal: %s" % error) + logging.critical("Fatal: %s", error) cleanup() sys.exit(1) @@ -676,7 +670,7 @@ def install_syslinux(device): # syslinux -d boot/isolinux /dev/sdb1 logging.info("Installing syslinux as bootloader") - logging.debug("syslinux -d boot/syslinux %s" % device) + logging.debug("syslinux -d boot/syslinux %s", device) proc = subprocess.Popen(["syslinux", "-d", "boot/syslinux", device]) proc.wait() if proc.returncode != 0: @@ -693,7 +687,7 @@ def install_bootloader(device): try: install_syslinux(device) except CriticalException, error: - logging.critical("Fatal: %s" % error) + logging.critical("Fatal: %s", error) cleanup() sys.exit(1) else: @@ -705,7 +699,7 @@ def install_bootloader(device): try: install_grub(device) except CriticalException, error: - logging.critical("Fatal: %s" % error) + logging.critical("Fatal: %s", error) cleanup() sys.exit(1) @@ -718,14 +712,14 @@ def execute_lilo(lilo, device): # to support -A for extended partitions: logging.info("Activating partitions in MBR via lilo") - logging.debug("%s -S /dev/null -M %s ext" % (lilo, device)) + logging.debug("%s -S /dev/null -M %s ext", lilo, device) proc = subprocess.Popen([lilo, "-S", "/dev/null", "-M", device, "ext"]) proc.wait() if proc.returncode != 0: raise Exception("error executing lilo") # activate partition: - logging.debug("%s -S /dev/null -A %s 1" % (lilo, device)) + logging.debug("%s -S /dev/null -A %s 1", lilo, device) proc = subprocess.Popen([lilo, "-S", "/dev/null", "-A", device, "1"]) proc.wait() if proc.returncode != 0: @@ -746,14 +740,14 @@ def install_syslinux_mbr(device): raise Exception("/usr/lib/syslinux/mbr.bin can not be read") logging.info("Installing syslinux MBR") - logging.debug("cat /usr/lib/syslinux/mbr.bin > %s" % device) + logging.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: - logging.critical("Error copying MBR to device (%s)" % retcode) + logging.critical("Error copying MBR to device (%s)", retcode) except OSError, error: - logging.critical("Execution failed:", error) + logging.critical("Execution failed: %s", error) def install_mir_mbr(mbrtemplate, device, partition, ismirbsdmbr=True): @@ -783,7 +777,7 @@ def install_mir_mbr(mbrtemplate, device, partition, ismirbsdmbr=True): logging.info("Installing default MBR") if not os.path.isfile(mbrtemplate): - logging.critical("Error: %s can not be read." % mbrtemplate) + logging.critical("Error: %s can not be read.", mbrtemplate) raise CriticalException("Error installing MBR (either try --syslinux-mbr or install missing file?)") if (partition < 0) or (partition > 3): @@ -796,14 +790,14 @@ def install_mir_mbr(mbrtemplate, device, partition, ismirbsdmbr=True): tmpf = tempfile.NamedTemporaryFile() - logging.debug("executing: dd if='%s' of='%s' bs=512 count=1" % (device, tmpf.name)) + logging.debug("executing: dd if='%s' of='%s' bs=512 count=1", device, tmpf.name) proc = subprocess.Popen(["dd", "if=%s" % device, "of=%s" % tmpf.name, "bs=512", "count=1"], stderr=file(os.devnull, "r+")) proc.wait() if proc.returncode != 0: raise Exception("error executing dd (first run)") - logging.debug("executing: dd if=%s of=%s bs=%s count=1 conv=notrunc" % (mbrtemplate, - tmpf.name, nmbrbytes)) + logging.debug("executing: dd if=%s of=%s bs=%s count=1 conv=notrunc", mbrtemplate, + tmpf.name, nmbrbytes) proc = subprocess.Popen(["dd", "if=%s" % mbrtemplate, "of=%s" % tmpf.name, "bs=%s" % nmbrbytes, "count=1", "conv=notrunc"], stderr=file(os.devnull, "r+")) proc.wait() @@ -831,7 +825,7 @@ def install_mir_mbr(mbrtemplate, device, partition, ismirbsdmbr=True): tmpf.file.write(mbrcode) tmpf.file.close() - logging.debug("executing: dd if='%s' of='%s' bs=512 count=1 conv=notrunc" % (tmpf.name, device)) + logging.debug("executing: dd if='%s' of='%s' bs=512 count=1 conv=notrunc", tmpf.name, device) proc = subprocess.Popen(["dd", "if=%s" % tmpf.name, "of=%s" % device, "bs=512", "count=1", "conv=notrunc"], stderr=file(os.devnull, "r+")) proc.wait() @@ -903,16 +897,16 @@ 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, therefore not mounting." % 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)) + logging.debug("mount %s %s %s", mount_options, source, target) proc = subprocess.Popen(["mount"] + list(mount_options) + [source, target]) proc.wait() if proc.returncode != 0: raise CriticalException("Error executing mount (no filesystem on the partition?)") else: - logging.debug("register_mountpoint(%s)" % target) + logging.debug("register_mountpoint(%s)", target) register_mountpoint(target) @@ -931,15 +925,15 @@ def unmount(target, unmount_options): target_unmount = True if not target_unmount: - logging.debug("%s not mounted anymore" % target) + logging.debug("%s not mounted anymore", target) else: - logging.debug("umount %s %s" % (list(unmount_options), target)) + logging.debug("umount %s %s", list(unmount_options), target) proc = subprocess.Popen(["umount"] + list(unmount_options) + [target]) proc.wait() if proc.returncode != 0: raise Exception("Error executing umount") else: - logging.debug("unregister_mountpoint(%s)" % target) + logging.debug("unregister_mountpoint(%s)", target) unregister_mountpoint(target) @@ -997,6 +991,25 @@ def mkdir(directory): pass +def exec_rsync(source, target): + """Simple wrapper around rsync to install files + + @source: source file/directory + @target: target file/directory""" + logging.debug("Source: %s / Target: %s", 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 @@ -1011,17 +1024,13 @@ def copy_system_files(grml_flavour, iso_mount, 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) @@ -1030,17 +1039,13 @@ def copy_system_files(grml_flavour, iso_mount, 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): @@ -1057,9 +1062,7 @@ 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) @@ -1069,9 +1072,7 @@ 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 -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) @@ -1081,9 +1082,7 @@ 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 -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): @@ -1100,61 +1099,47 @@ 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): @@ -1167,43 +1152,29 @@ 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(GRML2USB_BASE + "/grub/splash.xpm.gz"): - logging.critical("Error: %s/grub/splash.xpm.gz can not be read." % (GRML2USB_BASE, )) + 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 %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() + exec_rsync(GRML2USB_BASE + '/grub/splash.xpm.gz', grub_target + 'splash.xpm.gz') # grml splash in grub 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() + 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.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() - + 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 @@ -1252,7 +1223,7 @@ def uninstall_files(device): @device: partition where grml2usb files should be removed from""" # TODO - not implemented yet - logging.critical("TODO: uninstalling files from %s not yet implement, sorry." % device) + logging.critical("TODO: uninstalling files from %s not yet implement, sorry.", device) def identify_grml_flavour(mountpath): @@ -1463,7 +1434,7 @@ def handle_syslinux_config(grml_flavour, target): syslinux_config_file.write(generate_flavour_specific_syslinux_config(grml_flavour, bootopt)) syslinux_config_file.close() - logging.debug("Generating isolinux/syslinux splash %s" % syslinux_target + 'boot.msg') + logging.debug("Generating isolinux/syslinux splash %s", syslinux_target + 'boot.msg') isolinux_splash = open(syslinux_target + 'boot.msg', 'w') isolinux_splash.write(generate_isolinux_splash(grml_flavour)) isolinux_splash.close() @@ -1482,7 +1453,7 @@ def handle_bootloader_config(grml_flavour, device, target): try: handle_syslinux_config(grml_flavour, target) except CriticalException, error: - logging.critical("Fatal: %s" % error) + logging.critical("Fatal: %s", error) sys.exit(1) if options.skipgrubconfig: @@ -1491,7 +1462,7 @@ def handle_bootloader_config(grml_flavour, device, target): try: handle_grub_config(grml_flavour, device, target) except CriticalException, error: - logging.critical("Fatal: %s" % error) + logging.critical("Fatal: %s", error) sys.exit(1) def handle_dir(live_image, device): @@ -1500,7 +1471,7 @@ def handle_dir(live_image, device): @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) + logging.info("Using %s as install base", live_image) if os.path.isdir(device): logging.info("Specified target is a directory, therefore not mounting.") @@ -1513,14 +1484,14 @@ def handle_dir(live_image, device): try: mount(device, device_mountpoint, "") except CriticalException, error: - logging.critical("Fatal: %s" % error) + logging.critical("Fatal: %s", error) cleanup() sys.exit(1) try: try: grml_flavour = identify_grml_flavour(live_image) - logging.info("Identified grml flavour \"%s\"." % grml_flavour) + 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") @@ -1533,7 +1504,7 @@ def handle_dir(live_image, device): os.rmdir(device_mountpoint) unregister_tmpfile(device_mountpoint) except CriticalException, error: - logging.critical("Fatal: %s" % error) + logging.critical("Fatal: %s", error) cleanup() @@ -1543,21 +1514,21 @@ def handle_iso(iso, device): @iso: full path to the ISO that should be installed to the specified device @device: partition where the specified ISO should be installed to""" - logging.info("Using ISO %s" % iso) + logging.info("Using ISO %s", iso) iso_mountpoint = tempfile.mkdtemp(prefix="grml2usb") register_tmpfile(iso_mountpoint) remove_iso_mountpoint = True if not os.path.isfile(iso): - logging.critical("Fatal: specified ISO %s could not be read" % iso) + logging.critical("Fatal: specified ISO %s could not be read", iso) cleanup() sys.exit(1) try: mount(iso, iso_mountpoint, ["-o", "loop", "-t", "iso9660"]) except CriticalException, error: - logging.critical("Fatal: %s" % error) + logging.critical("Fatal: %s", error) sys.exit(1) if os.path.isdir(device): @@ -1572,14 +1543,14 @@ def handle_iso(iso, device): try: mount(device, device_mountpoint, "") except CriticalException, error: - logging.critical("Fatal: %s" % error) + logging.critical("Fatal: %s", error) cleanup() sys.exit(1) try: try: grml_flavour = identify_grml_flavour(iso_mountpoint) - logging.info("Identified grml flavour \"%s\"." % grml_flavour) + 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") @@ -1596,7 +1567,7 @@ def handle_iso(iso, device): os.rmdir(device_mountpoint) unregister_tmpfile(device_mountpoint) except CriticalException, error: - logging.critical("Fatal: %s" % error) + logging.critical("Fatal: %s", error) cleanup() @@ -1618,7 +1589,7 @@ def handle_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) + logging.info("Detected loop device - using %s as MBR device therefore", mbr_device) skip_install_mir_mbr = True try: @@ -1730,7 +1701,7 @@ def handle_bootloader(device): if options.copyonly: logging.info("Not installing bootloader and its files as requested via option copyonly.") elif os.path.isdir(device): - logging.info("Not installing bootloader as %s is a directory." % device) + logging.info("Not installing bootloader as %s is a directory.", device) else: install_bootloader(device) @@ -1794,13 +1765,13 @@ def main(): handle_bootloader(device) - logging.info("Note: grml flavour %s was installed as the default booting system." % GRML_DEFAULT) + 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)) + 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) + logging.info("Finished execution of grml2usb (%s). Have fun with your grml system.", PROG_VERSION) if __name__ == "__main__":