X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=6d2a75480e53035e1b78da834427e67431d516ad;hp=b3e25dfad146095d119e25fa3ecc12ef1040688a;hb=refs%2Fheads%2Fevgeni%2Fbetter_device_detection;hpb=35feaad92af2e631460f44204f2a9b88c40d7468 diff --git a/grml2usb b/grml2usb index b3e25df..6d2a754 100755 --- a/grml2usb +++ b/grml2usb @@ -15,24 +15,36 @@ This script installs a grml system (either a running system or ISO[s]) to a USB from optparse import OptionParser from inspect import isroutine, isclass -import datetime, logging, os, re, subprocess, sys, tempfile, time, os.path +import datetime import fileinput import glob -import uuid +import logging +import os +import os.path +import re import struct +import subprocess +import sys +import tempfile +import time +import uuid # The line following this line is patched by debian/rules and tarball.sh. -PROG_VERSION='***UNRELEASED***' +PROG_VERSION = '***UNRELEASED***' # global variables -MOUNTED = set() # register mountpoints -TMPFILES = set() # register tmpfiles -DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg -GRML_FLAVOURS = set() # which flavours are being installed? +MOUNTED = set() # register mountpoints +TMPFILES = set() # register tmpfiles +DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg +GRML_FLAVOURS = set() # which flavours are being installed? GRML_DEFAULT = None UUID = None SYSLINUX_LIBS = "/usr/lib/syslinux/" +RE_PARTITION = re.compile(r'([a-z/]*?)(\d+)$') +RE_P_PARTITION = re.compile(r'(.*?\d+)p(\d+)$') +RE_LOOP_DEVICE = re.compile(r'/dev/loop\d+$') + def syslinux_warning(option, opt, value, opt_parser): """A helper function for printing a warning about deprecated option """ @@ -41,6 +53,7 @@ def syslinux_warning(option, opt, value, opt_parser): "is grml2usb's default. Continuing anyway.\n") setattr(opt_parser.values, option.dest, True) + # if grub option is set, unset syslinux option def grub_option(option, opt, value, opt_parser): """A helper function adjusting other option values @@ -50,10 +63,10 @@ def grub_option(option, opt, value, opt_parser): setattr(opt_parser.values, 'syslinux', False) # cmdline parsing -USAGE = "Usage: %prog [options] <[ISO[s] | /live/image]> \n\ +USAGE = "Usage: %prog [options] <[ISO[s] | /lib/live/mount/medium]> \n\ \n\ -%prog installs grml ISO[s] to an USB device to be able to boot from it.\n\ -Make sure you have at least one grml ISO or a running grml system (/live/image),\n\ +%prog installs Grml ISO[s] to an USB device to be able to boot from it.\n\ +Make sure you have at least one Grml ISO or a running Grml system (/lib/live/mount/medium),\n\ grub or syslinux and root access.\n\ \n\ Run %prog --help for usage hints, further information via: man grml2usb" @@ -98,6 +111,8 @@ parser.add_option("--syslinux", dest="syslinux", action="callback", default=True help="install syslinux bootloader (deprecated as it's the default)") parser.add_option("--syslinux-mbr", dest="syslinuxmbr", action="store_true", help="install syslinux master boot record (MBR) instead of default") +parser.add_option("--tmpdir", dest="tmpdir", default="/tmp", + help="directory to be used for temporary files") parser.add_option("--verbose", dest="verbose", action="store_true", help="enable verbose mode") parser.add_option("-v", "--version", dest="version", action="store_true", @@ -111,7 +126,13 @@ if not os.path.isdir(GRML2USB_BASE): class CriticalException(Exception): - """Throw critical exception if the exact error is not known but fatal." + """Throw critical exception if the exact error is not known but fatal. + + @Exception: message""" + pass + +class VerifyException(Exception): + """Throw critical exception if there is an fatal error when verifying something. @Exception: message""" pass @@ -247,16 +268,18 @@ def get_defaults_file(iso_mount, flavour, name): "%s_%s" % (get_flavour_filename(flavour), name): if os.path.isfile(iso_mount + directory + name): return (directory, name) - return ('','') + return ('', '') -def search_file(filename, search_path='/bin' + os.pathsep + '/usr/bin'): + +def search_file(filename, search_path='/bin' + os.pathsep + '/usr/bin', lst_return=False): """Given a search path, find file @filename: name of file to search for - @search_path: path where searching for the specified filename""" - file_found = 0 + @search_path: path where searching for the specified filename + @lst_return: return list of matching files instead one file""" paths = search_path.split(os.pathsep) - current_dir = '' # make pylint happy :) + current_dir = '' # make pylint happy :) + retval = [] def match_file(cwd): """Helper function ffor testing if specified file exists in cwd @@ -268,25 +291,43 @@ def search_file(filename, search_path='/bin' + os.pathsep + '/usr/bin'): for path in paths: current_dir = path if match_file(current_dir): - file_found = 1 - break + retval.append(os.path.abspath(os.path.join(current_dir, filename))) + if not lst_return: + break # pylint: disable-msg=W0612 for current_dir, directories, files in os.walk(path): if match_file(current_dir): - file_found = 1 - break - if file_found: - return os.path.abspath(os.path.join(current_dir, filename)) + retval.append(os.path.abspath(os.path.join(current_dir, filename))) + if not lst_return: + break + if lst_return: + return retval + elif retval: + return retval[0] else: return None def check_uid_root(): """Check for root permissions""" - if not os.geteuid()==0: + if not os.geteuid() == 0: sys.exit("Error: please run this script with uid 0 (root).") +def check_boot_flag(device): + boot_dev, x = get_device_from_partition(device) + + with open(boot_dev, 'r') as image: + data = image.read(512) + bootcode = data[440:] + if bootcode[6] == '\x80': + logging.debug("bootflag is enabled") + else: + logging.debug("bootflag is NOT enabled") + raise VerifyException("Device %s does not have the bootflag set. " + "Please enable it to be able to boot." % boot_dev) + + def mkfs_fat16(device): """Format specified device with VFAT/FAT16 filesystem. @@ -316,7 +357,7 @@ def generate_isolinux_splash(grml_flavour): Some information and boot options available via keys F2 - F10. http://grml.org/ %(grml_name)s -""" % {'grml_name': grml_name} ) +""" % {'grml_name': grml_name}) def generate_main_syslinux_config(*arg): @@ -364,7 +405,6 @@ def generate_flavour_specific_syslinux_config(grml_flavour): @grml_flavour: name of grml flavour the configuration should be generated for""" - return("""\ menu begin grml %(grml_flavour)s menu title %(display_name)s @@ -376,7 +416,7 @@ menu begin grml %(grml_flavour)s include %(grml_flavour)s_grml.cfg menu hide menu end -""" % {'grml_flavour': grml_flavour, 'display_name' : grml_flavour.replace('_', '-') } ) +""" % {'grml_flavour': grml_flavour, 'display_name': get_flavour_filename(grml_flavour)}) def install_grub(device): @@ -397,15 +437,12 @@ def install_grub(device): # If using --grub-mbr then make sure we install grub in MBR instead of PBR 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 + grub_device, x = get_device_from_partition(device) else: grub_device = device logging.info("Installing grub as bootloader") - for opt in ["", "--force" ]: + for opt in ["", "--force"]: logging.debug("grub-install --recheck %s --no-floppy --root-directory=%s %s", opt, device_mountpoint, grub_device) proc = subprocess.Popen(["grub-install", "--recheck", opt, "--no-floppy", @@ -546,7 +583,7 @@ def install_mbr(mbrtemplate, device, partition, ismirbsdmbr=True): mbrcode[463:478] + actives[2] + \ mbrcode[479:494] + actives[3] + \ mbrcode[495:510] + "\x55\xAA" - + tmpf.file.seek(0) tmpf.file.truncate() tmpf.file.write(mbrcode) @@ -741,6 +778,13 @@ def get_uuid(target): return write_uuid(uuid_file_name) +def get_shortname(grml_flavour): + """Get shortname based from grml_flavour name. The rules applied are the same as in grml-live + @grml_flavour: flavour name which shold be translated to shortname""" + + return re.sub(r'[,._-]', '', grml_flavour) + + def copy_system_files(grml_flavour, iso_mount, target): """copy grml's main files (like squashfs, kernel and initrd) to a given target @@ -768,19 +812,23 @@ def copy_system_files(grml_flavour, iso_mount, target): else: exec_rsync(filesystem_module, squashfs_target + 'filesystem.module') - kernel = search_file('vmlinuz', iso_mount) - if kernel is None: - # compat for releases < 2011.12 - kernel = search_file('linux26', iso_mount) + shortname = get_shortname(grml_flavour) + if os.path.isdir(iso_mount + '/boot/' + shortname): + exec_rsync(iso_mount + '/boot/' + shortname, target + '/boot') + else: + kernel = search_file('vmlinuz', iso_mount) + if kernel is None: + # compat for releases < 2011.12 + kernel = search_file('linux26', iso_mount) - if kernel is None: - logging.critical("Fatal: kernel not found") - raise CriticalException("error locating kernel file") + if kernel is None: + logging.critical("Fatal: kernel not found") + raise CriticalException("error locating kernel file") - source = os.path.dirname(kernel) + '/' - dest = target + '/' + os.path.dirname(kernel).replace(iso_mount,'') + '/' - execute(mkdir, dest) - exec_rsync(source, dest) + source = os.path.dirname(kernel) + '/' + dest = target + '/' + os.path.dirname(kernel).replace(iso_mount, '') + '/' + execute(mkdir, dest) + exec_rsync(source, dest) def update_grml_versions(iso_mount, target): @@ -827,6 +875,7 @@ def update_grml_versions(iso_mount, target): else: return False + def copy_grml_files(grml_flavour, iso_mount, target): """copy some minor grml files to a given target @@ -839,12 +888,12 @@ def copy_grml_files(grml_flavour, iso_mount, target): grml_prefixe = ["GRML", "grml"] for prefix in grml_prefixe: - filename = "{0}/{1}/{2}".format(iso_mount, prefix, grml_flavour) - if os.path.exists(filename): - exec_rsync(filename, grml_target) - break + filename = "{0}/{1}/{2}".format(iso_mount, prefix, grml_flavour) + if os.path.exists(filename): + exec_rsync(filename, grml_target) + break else: - logging.warn("Warning: could not find flavour directory for %s ", grml_flavour) + logging.warn("Warning: could not find flavour directory for %s ", grml_flavour) def handle_addon_copy(filename, dst, iso_mount, ignore_errors=False): @@ -858,7 +907,7 @@ def handle_addon_copy(filename, dst, iso_mount, ignore_errors=False): file_location = search_file(filename, iso_mount) if file_location is None: if not ignore_errors: - logging.warn("Warning: %s not found (that's fine if you don't need it)", filename) + logging.warn("Warning: %s not found (that's fine if you don't need it)", filename) else: exec_rsync(file_location, dst) @@ -875,22 +924,15 @@ def copy_addons(iso_mount, target): # grub all-in-one image handle_addon_copy('allinone.img', addons, iso_mount) - # bsd imag + # bsd image handle_addon_copy('bsd4grml', addons, iso_mount) + # DOS image handle_addon_copy('balder10.imz', addons, iso_mount) - # 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: - exec_rsync(hdtimg, addons + '/hdt.c32') - - # pci.ids file - picids = search_file('pci.ids', iso_mount) - if picids: - exec_rsync(picids, addons + '/pci.ids') + # syslinux + pci.ids for hdt + for expr in '*.c32', 'pci.ids': + glob_and_copy(iso_mount + '/boot/addons/' + expr, addons) # memdisk image handle_addon_copy('memdisk', addons, iso_mount) @@ -904,6 +946,36 @@ def copy_addons(iso_mount, target): # ipxe.lkrn handle_addon_copy('ipxe.lkrn', addons, iso_mount) + +def build_loopbackcfg(target): + """Generate GRUB's loopback.cfg based on existing config files. + + @target: target directory + """ + + grub_dir = '/boot/grub/' + mkdir(os.path.join(target, grub_dir)) + + f = open(target + grub_dir + 'loopback.cfg', 'w') + + f.write("# grml2usb generated grub2 configuration file\n") + f.write("source /boot/grub/header.cfg\n") + + for defaults in glob.glob(target + os.path.sep + grub_dir + os.path.sep + "*_default.cfg"): + sourcefile = defaults.split(target + os.path.sep)[1] + logging.debug("Found source file" + sourcefile) + os.path.isfile(defaults) and f.write("source " + sourcefile + "\n") + + for ops in glob.glob(target + os.path.sep + grub_dir + os.path.sep + "*_options.cfg"): + sourcefile = ops.split(target + os.path.sep)[1] + logging.debug("Found source file" + sourcefile) + os.path.isfile(ops) and f.write("source " + sourcefile + "\n") + + f.write("source /boot/grub/adddons.cfg\n") + f.write("source /boot/grub/footer.cfg\n") + f.close() + + def glob_and_copy(filepattern, dst): """Glob on specified filepattern and copy the result to dst @@ -913,6 +985,7 @@ def glob_and_copy(filepattern, dst): for name in glob.glob(filepattern): copy_if_exist(name, dst) + def search_and_copy(filename, search_path, dst): """Search for the specified filename at searchpath and copy it to dst @@ -923,6 +996,7 @@ def search_and_copy(filename, search_path, dst): file_location = search_file(filename, search_path) copy_if_exist(file_location, dst) + def copy_if_exist(filename, dst): """Copy filename to dst if filename is set. @@ -932,6 +1006,7 @@ def copy_if_exist(filename, dst): if filename and (os.path.isfile(filename) or os.path.isdir(filename)): exec_rsync(filename, dst) + def copy_bootloader_files(iso_mount, target, grml_flavour): """Copy grml's bootloader files to a given target @@ -959,16 +1034,9 @@ def copy_bootloader_files(iso_mount, target, grml_flavour): mkdir(target + '/boot/') exec_rsync(efi_img, target + '/boot/efi.img') - for ffile in ['f%d' % number for number in range(1, 11) ]: + for ffile in ['f%d' % number for number in range(1, 11)]: search_and_copy(ffile, iso_mount, syslinux_target + ffile) - loopback_cfg = search_file("loopback.cfg", iso_mount) - if loopback_cfg: - directory = os.path.dirname(loopback_cfg) - directory = directory.replace(iso_mount, "") - mkdir(os.path.join(target, directory)) - exec_rsync(loopback_cfg, target + os.path.sep + directory) - # avoid the "file is read only, overwrite anyway (y/n) ?" question # of mtools by syslinux ("mmove -D o -D O s:/ldlinux.sys $target_file") if os.path.isfile(syslinux_target + 'ldlinux.sys'): @@ -995,7 +1063,6 @@ def copy_bootloader_files(iso_mount, target, grml_flavour): for filename in glob.glob1(syslinux_target, "*.c32"): copy_if_exist(os.path.join(SYSLINUX_LIBS, filename), syslinux_target) - # copy the addons_*.cfg file to the new syslinux directory glob_and_copy(iso_mount + source_dir + 'addon*.cfg', syslinux_target) @@ -1004,6 +1071,10 @@ def copy_bootloader_files(iso_mount, target, grml_flavour): # copy all grub files from ISO glob_and_copy(iso_mount + '/boot/grub/*', grub_target) + # finally (after all GRUB files have been been installed) build static loopback.cfg + build_loopbackcfg(target) + + def install_iso_files(grml_flavour, iso_mount, device, target): """Copy files from ISO to given target @@ -1042,37 +1113,61 @@ def install_iso_files(grml_flavour, iso_mount, device, target): proc.wait() +def get_device_from_partition(partition): + device = partition + partition_number = None + if partition[-1].isdigit() and not RE_LOOP_DEVICE.match(partition): + m = RE_P_PARTITION.match(partition) + if not m: + m = RE_PARTITION.match(partition) + if m: + device = m.group(1) + partition_number = int(m.group(2)) - 1 + return (device, partition_number) + + def get_flavour(flavour_str): """Returns the flavour of a grml version string """ return re.match(r'[\w-]*', flavour_str).group() + def identify_grml_flavour(mountpath): """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) + version_files = search_file('grml-version', mountpath, lst_return=True) - if version_file == "": - logging.critical("Error: could not find grml-version file.") - raise + if not version_files: + if mountpath.startswith("/lib/live/mount/medium"): + logging.critical("Error: could not find grml-version file.") + logging.critical("Looks like your system is running from RAM but required files are not available.") + logging.critical("Please either boot without toram=... or use boot option toram instead of toram=...") + cleanup() + sys.exit(1) + else: + logging.critical("Error: could not find grml-version file.") + cleanup() + sys.exit(1) flavours = [] - tmpfile = None - try: - tmpfile = open(version_file, 'r') - for line in tmpfile.readlines(): - flavours.append(get_flavour(line)) - except TypeError, e: - raise - except Exception, e: - logging.critical("Unexpected error: %s", e) - raise - finally: - if tmpfile: - tmpfile.close() + logging.debug("version_files = %s", version_files) + for version_file in version_files: + tmpfile = None + try: + tmpfile = open(version_file, 'r') + for line in tmpfile.readlines(): + flavours.append(get_flavour(line)) + except TypeError, e: + raise + except Exception, e: + logging.critical("Unexpected error: %s", e) + raise + finally: + if tmpfile: + tmpfile.close() return flavours @@ -1116,13 +1211,16 @@ def handle_grub_config(grml_flavour, device, target): for regex in options.removeoption: remove_regexes.append(re.compile(regex)) + shortname = get_shortname(grml_flavour) for filename in glob.glob(grub_target + '*.cfg'): for line in fileinput.input(filename, inplace=1): line = line.rstrip("\r\n") if option_re.search(line): line = bootid_re.sub('', line) - line = live_media_path_re.sub('', line) - line = line.rstrip() + r' live-media-path=/live/%s/ bootid=%s %s ' % (grml_flavour, UUID, bootopt) + if shortname in filename: + line = live_media_path_re.sub('', line) + line = line.rstrip() + ' live-media-path=/live/%s/ ' % (grml_flavour) + line = line.rstrip() + r' bootid=%s %s ' % (UUID, bootopt) for regex in remove_regexes: line = regex.sub(' ', line) print line @@ -1147,6 +1245,7 @@ def initial_syslinux_config(target): data.write("include hidden.cfg\n") data.close() + def add_entry_if_not_present(filename, entry): """Write entry into filename if entry is not already in the file @@ -1162,6 +1261,7 @@ def add_entry_if_not_present(filename, entry): data.close() + def get_flavour_filename(flavour): """Generate a iso9960 save filename out of the specified flavour @@ -1169,6 +1269,7 @@ def get_flavour_filename(flavour): """ return flavour.replace('-', '_') + def adjust_syslinux_bootoptions(src, flavour): """Adjust existing bootoptions of specified syslinux config to grml2usb specific ones, e.g. change the location of the kernel... @@ -1207,6 +1308,7 @@ def adjust_syslinux_bootoptions(src, flavour): sys.stdout.write(line) fileinput.close() + def adjust_labels(src, replacement): """Adjust the specified labels in the syslinux config file src with specified replacement @@ -1235,6 +1337,7 @@ def add_syslinux_entry(filename, grml_flavour): data.write(generate_flavour_specific_syslinux_config(grml_flavour)) data.close() + def modify_filenames(grml_flavour, target, filenames): """Replace the standard filenames with the new ones @@ -1242,7 +1345,7 @@ def modify_filenames(grml_flavour, target, filenames): @target: directory where the files are located @filenames: list of filenames to alter """ - grml_filename = grml_flavour.replace('-', '_') + grml_filename = get_flavour_filename(grml_flavour) for filename in filenames: old_filename = "%s/%s" % (target, filename) new_filename = "%s/%s_%s" % (target, grml_filename, filename) @@ -1274,7 +1377,6 @@ def handle_syslinux_config(grml_flavour, target): execute(mkdir, syslinux_target) syslinux_cfg = syslinux_target + 'syslinux.cfg' - # install main configuration only *once*, no matter how many ISOs we have: syslinux_config_file = open(syslinux_cfg, 'w') syslinux_config_file.write("TIMEOUT 300\n") @@ -1286,29 +1388,26 @@ def handle_syslinux_config(grml_flavour, target): prompt_name.close() initial_syslinux_config(syslinux_target) - flavour_filename = grml_flavour.replace('-', '_') + flavour_filename = get_flavour_filename(grml_flavour) if search_file('default.cfg', syslinux_target): modify_filenames(grml_flavour, syslinux_target, ['grml.cfg', 'default.cfg']) filename = search_file("new_hidden.cfg", syslinux_target) - # process hidden file if not search_file("hidden.cfg", syslinux_target): new_hidden = syslinux_target + "hidden.cfg" os.rename(filename, new_hidden) adjust_syslinux_bootoptions(new_hidden, grml_flavour) else: - new_hidden_file = "%s/%s_hidden.cfg" % (syslinux_target, flavour_filename) + new_hidden_file = "%s/%s_hidden.cfg" % (syslinux_target, flavour_filename) os.rename(filename, new_hidden_file) adjust_labels(new_hidden_file, r'\1 %s-\2' % grml_flavour) adjust_syslinux_bootoptions(new_hidden_file, grml_flavour) entry = 'include %s_hidden.cfg\n' % flavour_filename add_entry_if_not_present("%s/hiddens.cfg" % syslinux_target, entry) - - new_default = "%s_default.cfg" % (flavour_filename) entry = 'include %s\n' % new_default defaults_file = '%s/defaults.cfg' % syslinux_target @@ -1361,7 +1460,6 @@ def handle_bootloader_config(grml_flavour, device, target): sys.exit(1) - def install(image, device): """Install a grml image to the specified device @@ -1374,7 +1472,7 @@ def install(image, device): logging.info("Using %s as install base", image) else: logging.info("Using ISO %s", image) - iso_mountpoint = tempfile.mkdtemp(prefix="grml2usb") + iso_mountpoint = tempfile.mkdtemp(prefix="grml2usb", dir=options.tmpdir) register_tmpfile(iso_mountpoint) remove_image_mountpoint = True try: @@ -1394,16 +1492,15 @@ def install(image, device): cleanup() - def install_grml(mountpoint, device): """Main logic for copying files of the currently running grml system. - @mountpoin: directory where currently running live system resides (usually /live/image) + @mountpoint: directory where currently running live system resides (usually /lib/live/mount/medium) @device: partition where the specified ISO should be installed to""" device_mountpoint = device if os.path.isdir(device): - logging.info("Specified device is not a directory, therefore not mounting.") + logging.info("Specified device is a directory, therefore not mounting.") remove_device_mountpoint = False else: device_mountpoint = tempfile.mkdtemp(prefix="grml2usb") @@ -1411,7 +1508,11 @@ def install_grml(mountpoint, device): remove_device_mountpoint = True try: check_for_fat(device) + check_boot_flag(device) mount(device, device_mountpoint, ['-o', 'utf8,iocharset=iso8859-1']) + except VerifyException, error: + logging.critical("Fatal: %s", error) + raise except CriticalException, error: try: mount(device, device_mountpoint, "") @@ -1430,6 +1531,7 @@ def install_grml(mountpoint, device): if remove_device_mountpoint: remove_mountpoint(device_mountpoint) + def remove_mountpoint(mountpoint): """remove a registred mountpoint """ @@ -1443,6 +1545,7 @@ def remove_mountpoint(mountpoint): logging.critical("Fatal: %s", error) cleanup() + def handle_mbr(device): """Main handler for installing master boot record (MBR) @@ -1452,12 +1555,9 @@ def handle_mbr(device): logging.info("Would install MBR") return 0 - if device[-1:].isdigit(): - mbr_device = re.match(r'(.*?)\d*$', device).group(1) - partition_number = int(device[-1:]) - 1 - else: + mbr_device, partition_number = get_device_from_partition(device) + if not partition_number: logging.warn("Could not detect partition number, not activating partition") - partition_number = None # if we get e.g. /dev/loop1 as device we don't want to put the MBR # into /dev/loop of course, therefore use /dev/loop1 as mbr_device @@ -1602,11 +1702,13 @@ def check_programs(): logging.critical("Fatal: rsync not available, can not continue - sorry.") sys.exit(1) + def load_loop(): """Runs modprobe loop and throws away it's output""" proc = subprocess.Popen(["modprobe", "loop"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) proc.wait() + def main(): """Main function [make pylint happy :)]""" @@ -1635,7 +1737,7 @@ def main(): check_programs() # specified arguments - device = args[len(args) - 1] + device = os.path.realpath(args[len(args) - 1]) isos = args[0:len(args) - 1] if not os.path.isdir(device):