X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=grml2usb;h=c0d7783c5a6225f54c0d4a78840b2844255d0b3e;hb=aaee2551ea3b5cb33a9eddd3764145a58cb59000;hp=3ca38a5c0d9dec415800965a9296ec49624ce4a9;hpb=0deeae3373cffe3a007b8bf6c0b642830601c9b7;p=grml2usb.git diff --git a/grml2usb b/grml2usb index 3ca38a5..c0d7783 100755 --- a/grml2usb +++ b/grml2usb @@ -40,7 +40,11 @@ GRML_FLAVOURS = set() # which flavours are being installed? GRML_DEFAULT = None UUID = None SYSLINUX_LIBS = "/usr/lib/syslinux/" +GRUB_INSTALL = "grub-install" +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 @@ -312,10 +316,7 @@ def check_uid_root(): def check_boot_flag(device): - if device[-1:].isdigit(): - boot_dev = re.match(r'(.*?)\d*$', device).group(1) - else: - boot_dev = device + boot_dev, x = get_device_from_partition(device) with open(boot_dev, 'r') as image: data = image.read(512) @@ -426,7 +427,7 @@ def install_grub(device): @device: partition where grub should be installed to""" if options.dryrun: - logging.info("Would execute grub-install [--root-directory=mount_point] %s now.", device) + logging.info("Would execute %s [--root-directory=mount_point] %s now.", (GRUB_INSTALL, device)) else: device_mountpoint = tempfile.mkdtemp(prefix="grml2usb") register_tmpfile(device_mountpoint) @@ -437,18 +438,15 @@ 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"]: - 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", + logging.debug("%s --recheck %s --no-floppy --root-directory=%s %s", + GRUB_INSTALL, opt, device_mountpoint, grub_device) + proc = subprocess.Popen([GRUB_INSTALL, "--recheck", opt, "--no-floppy", "--root-directory=%s" % device_mountpoint, grub_device], stdout=file(os.devnull, "r+")) proc.wait() @@ -456,9 +454,9 @@ def install_grub(device): break if proc.returncode != 0: - # raise Exception("error executing grub-install") - logging.critical("Fatal: error executing grub-install " - + "(please check the grml2usb FAQ or drop the --grub option)") + # raise Exception("error executing %s" % (GRUB_INSTALL)) + logging.critical("Fatal: error executing %s " + + "(please check the grml2usb FAQ or drop the --grub option)" % (GRUB_INSTALL)) logging.critical("Note: if using grub2 consider using " + "the --grub-mbr option as grub considers PBR problematic.") cleanup() @@ -1116,6 +1114,19 @@ 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 """ @@ -1462,7 +1473,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", dir=options.tmpdir) + iso_mountpoint = tempfile.mkdtemp(prefix="grml2usb", dir=os.path.abspath(options.tmpdir)) register_tmpfile(iso_mountpoint) remove_image_mountpoint = True try: @@ -1545,12 +1556,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 @@ -1678,12 +1686,16 @@ def check_options(opts): def check_programs(): + global GRUB_INSTALL """check if all needed programs are installed""" 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 not which(GRUB_INSTALL): + if which("grub2-install"): # Fedora workaround + GRUB_INSTALL="grub2-install" + else: + 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"): @@ -1698,6 +1710,11 @@ def check_programs(): def load_loop(): """Runs modprobe loop and throws away it's output""" + if not which("modprobe"): + logging.critical("Fatal: modprobe not available, can not continue - sorry.") + logging.critical("Hint: is /sbin missing in PATH?") + sys.exit(1) + proc = subprocess.Popen(["modprobe", "loop"], stdout=subprocess.PIPE, stderr=subprocess.PIPE) proc.wait()