X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=9cca9d72240f1938bfa9a2aee12fb1c042758d7b;hp=a13e6eac9c18f9f523830b5cb8f7910e97aab7eb;hb=1d62665b55631ae470ed65fa61d517e3392da108;hpb=e3271ff457c955c12b859591542b3e597677d584 diff --git a/grml2usb b/grml2usb index a13e6ea..9cca9d7 100755 --- a/grml2usb +++ b/grml2usb @@ -22,7 +22,7 @@ import uuid import struct # global variables -PROG_VERSION = "0.9.25" +PROG_VERSION = "0.9.27~git" MOUNTED = set() # register mountpoints TMPFILES = set() # register tmpfiles DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg @@ -34,7 +34,7 @@ def syslinux_warning(option, opt, value, opt_parser): """A helper function for printing a warning about deprecated option """ # pylint: disable-msg=W0613 - sys.stderr.write("Note: the --syslinux option is deprecated as syslinux " + + sys.stderr.write("Note: the --syslinux option is deprecated as syslinux " "is grml2usb's default. Continuing anyway.\n") setattr(opt_parser.values, option.dest, True) @@ -649,7 +649,7 @@ def install_grub(device): grub_device = device logging.info("Installing grub as bootloader") - logging.debug("grub-install --recheck --no-floppy --root-directory=%s %s", + logging.debug("grub-install --recheck --force --no-floppy --root-directory=%s %s", device_mountpoint, grub_device) proc = subprocess.Popen(["grub-install", "--recheck", "--force", "--no-floppy", "--root-directory=%s" % device_mountpoint, grub_device], @@ -699,18 +699,12 @@ def install_bootloader(device): # by default we use grub, so install syslinux only on request if options.grub: - if not which("grub-install"): - logging.critical("Fatal: grub-install not available (please install the " - + "grub package or use the --syslinux option)") + try: + install_grub(device) + except CriticalException, error: + logging.critical("Fatal: %s", error) cleanup() sys.exit(1) - else: - try: - install_grub(device) - except CriticalException, error: - logging.critical("Fatal: %s", error) - cleanup() - sys.exit(1) else: try: install_syslinux(device) @@ -910,8 +904,8 @@ def mount(source, target, mount_options): for x in file('/proc/mounts').readlines(): if x.startswith(source): - raise CriticalException("Error executing mount: %s already mounted - " - + "please unmount before invoking grml2usb" % source) + raise CriticalException("Error executing mount: %s already mounted - " % source + + "please unmount before invoking grml2usb") if os.path.isdir(source): logging.debug("Source %s is not a device, therefore not mounting.", source) @@ -980,18 +974,19 @@ def check_for_fat(partition): @partition: device name of partition""" + if not os.access(partition, os.R_OK): + raise CriticalException("Failed to read device %s" + " (wrong UID/permissions or device/directory not present?)" % partition) + try: udev_info = subprocess.Popen(["/sbin/blkid", "-s", "TYPE", "-o", "value", partition], stdout=subprocess.PIPE, stderr=subprocess.PIPE) filesystem = udev_info.communicate()[0].rstrip() - if udev_info.returncode == 2: - raise CriticalException("Failed to read device %s" - " (wrong UID/permissions or device/directory not present?)" % partition) - if filesystem != "vfat": - raise CriticalException("Partition %s does not contain a FAT16 filesystem. " - + "(Use --fat16 or run mkfs.vfat %s)" % (partition, partition)) + raise CriticalException( + "Partition %s does not contain a FAT16 filesystem. " + "(Use --fat16 or run mkfs.vfat %s)" % (partition, partition)) except OSError: raise CriticalException("Sorry, /sbin/blkid not available (install e2fsprogs?)") @@ -1268,11 +1263,13 @@ 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): +def copy_bootloader_files(iso_mount, target, grml_flavour): """Copy grml's bootloader files to a given target @iso_mount: path where a grml ISO is mounted on - @target: path where grml's main files should be copied to""" + @target: path where grml's main files should be copied to + @grml_flavour: name of the current processed grml_flavour + """ syslinux_target = target + '/boot/syslinux/' execute(mkdir, syslinux_target) @@ -1300,8 +1297,8 @@ def copy_bootloader_files(iso_mount, target): if os.path.isfile(syslinux_target + 'ldlinux.sys'): os.unlink(syslinux_target + 'ldlinux.sys') - (source_dir, name) = get_defaults_file(iso_mount, GRML_DEFAULT, "default.cfg") - (source_dir, defaults_file) = get_defaults_file(iso_mount, GRML_DEFAULT, "grml.cfg") + (source_dir, name) = get_defaults_file(iso_mount, grml_flavour, "default.cfg") + (source_dir, defaults_file) = get_defaults_file(iso_mount, grml_flavour, "grml.cfg") if not source_dir: logging.critical("Fatal: file default.cfg could not be found.") @@ -1353,7 +1350,7 @@ def install_iso_files(grml_flavour, iso_mount, device, target): @target: path where grml's main files should be copied to""" global GRML_DEFAULT - GRML_DEFAULT = grml_flavour + GRML_DEFAULT = GRML_DEFAULT or grml_flavour if options.dryrun: return 0 elif not options.bootloaderonly: @@ -1372,7 +1369,7 @@ def install_iso_files(grml_flavour, iso_mount, device, target): copy_addons(iso_mount, target) if not options.copyonly: - copy_bootloader_files(iso_mount, target) + copy_bootloader_files(iso_mount, target, grml_flavour) if not options.dryrun: handle_bootloader_config(grml_flavour, device, target) @@ -1871,11 +1868,13 @@ def install_grml(mountpoint, device): except CriticalException, error: logging.critical("Fatal: %s", error) raise + global GRML_FLAVOURS try: grml_flavours = identify_grml_flavour(mountpoint) for flavour in set(grml_flavours): logging.info("Identified grml flavour \"%s\".", flavour) install_iso_files(flavour, mountpoint, device, device_mountpoint) + GRML_FLAVOURS.add(flavour) finally: if remove_device_mountpoint: remove_mountpoint(device_mountpoint) @@ -2056,7 +2055,6 @@ def main(): if options.dryrun: logging.info("Running in simulation mode as requested via option dry-run.") - # specified arguments device = args[len(args) - 1] isos = args[0:len(args) - 1] @@ -2070,6 +2068,18 @@ def main(): logging.critical("Fatal: installation on raw device not supported. (BIOS won't support it.)") sys.exit(1) + if options.grub: + if not which("grub-install"): + logging.critical("Fatal: grub-install not available (please install the " + + "grub package or drop the --grub option)") + sys.exit(1) + + if options.syslinux: + if not which("syslinux"): + logging.critical("Fatal: syslinux not available (please install the " + + "syslinux package or use the --grub option)") + sys.exit(1) + if not which("rsync"): logging.critical("Fatal: rsync not available, can not continue - sorry.") sys.exit(1)