X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=14b768fc60fbbb1f4a68724c7e06779ca1b60313;hp=217020dedcf6bdc6b8c72dd63a3003c008d7ab96;hb=e5ae97fdf02635dee08648b2f2fb4006db269b17;hpb=5d028a0bf6d7dd63f8e897013f7530185ea6a85c diff --git a/grml2usb b/grml2usb index 217020d..14b768f 100755 --- a/grml2usb +++ b/grml2usb @@ -77,8 +77,6 @@ parser.add_option("--grub", dest="grub", action="callback", help="install grub bootloader instead of (default) syslinux") parser.add_option("--grub-mbr", dest="grubmbr", action="store_true", help="install grub into MBR instead of (default) PBR") -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", help="enable interactive boot menu in MBR") parser.add_option("--quiet", dest="quiet", action="store_true", @@ -649,52 +647,7 @@ def install_bootloader(device): sys.exit(1) -def execute_lilo(lilo, device): - """execute lilo for activating the partitions in the MBR - - @lilo: path of lilo executable - @device: device where lilo should be executed on""" - - # 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) - 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) - proc = subprocess.Popen([lilo, "-S", "/dev/null", "-A", device, "1"]) - proc.wait() - if proc.returncode != 0: - raise Exception("error executing lilo") - - -def install_syslinux_mbr(device): - """install syslinux's master boot record (MBR) on the specified device - - @device: device where MBR of syslinux should be installed to""" - - # make sure we have syslinux available - if not which("syslinux") and not options.copyonly: - raise Exception("syslinux not available (either install it or consider using the --grub option)") - - # lilo's mbr is broken, use the one from syslinux instead: - if not os.path.isfile("/usr/lib/syslinux/mbr.bin"): - 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) - try: - retcode = subprocess.call("cat /usr/lib/syslinux/mbr.bin > "+ device, shell=True) - if retcode < 0: - logging.critical("Error copying MBR to device (%s)", retcode) - except OSError, error: - logging.critical("Execution failed: %s", error) - - -def install_mir_mbr(mbrtemplate, device, partition, ismirbsdmbr=True): +def install_mbr(mbrtemplate, device, partition, ismirbsdmbr=True): """install 'mbr' master boot record (MBR) on a device Retrieve the partition table from "device", install an MBR from the @@ -722,10 +675,11 @@ def install_mir_mbr(mbrtemplate, device, partition, ismirbsdmbr=True): if not os.path.isfile(mbrtemplate): logging.critical("Error: %s can not be read.", mbrtemplate) - raise CriticalException("Error installing MBR (either try --syslinux-mbr or install missing file?)") + raise CriticalException("Error installing MBR (either try --syslinux-mbr or install missing file \"%s\"?)" % mbrtemplate) - if (partition < 0) or (partition > 3): - raise ValueError("partition must be between 0 and 3") + if partition is not None and ((partition < 0) or (partition > 3)): + logging.warn("Cannot activate partition %d" % partition) + partition = None if ismirbsdmbr: nmbrbytes = 439 @@ -753,18 +707,19 @@ def install_mir_mbr(mbrtemplate, device, partition, ismirbsdmbr=True): if len(mbrcode) < 512: raise EOFError("MBR size (%d) < 512" % len(mbrcode)) - if ismirbsdmbr: - mbrcode = mbrcode[0:439] + chr(partition) + \ - mbrcode[440:510] + "\x55\xAA" - else: - actives = ["\x00", "\x00", "\x00", "\x00"] - actives[partition] = "\x80" - mbrcode = mbrcode[0:446] + actives[0] + \ - mbrcode[447:462] + actives[1] + \ - mbrcode[463:478] + actives[2] + \ - mbrcode[479:494] + actives[3] + \ - mbrcode[495:510] + "\x55\xAA" - + if partition is not None: + if ismirbsdmbr: + mbrcode = mbrcode[0:439] + chr(partition) + \ + mbrcode[440:510] + "\x55\xAA" + else: + actives = ["\x00", "\x00", "\x00", "\x00"] + actives[partition] = "\x80" + mbrcode = mbrcode[0:446] + actives[0] + \ + mbrcode[447:462] + actives[1] + \ + 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) @@ -779,39 +734,6 @@ def install_mir_mbr(mbrtemplate, device, partition, ismirbsdmbr=True): del tmpf -def handle_syslinux_mbr(device): - """Install syslinux 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") - - # try to use system's lilo - if which("lilo"): - lilo = which("lilo") - else: - # otherwise fall back to our static version - from platform import architecture - if architecture()[0] == '64bit': - lilo = GRML2USB_BASE + '/lilo/lilo.static.amd64' - else: - lilo = GRML2USB_BASE + '/lilo/lilo.static.i386' - # finally prefer a specified lilo executable - if options.lilobin: - lilo = options.lilobin - - if not is_exe(lilo): - raise Exception("lilo executable can not be execute") - - if options.dryrun: - logging.info("Would install MBR running lilo and using syslinux.") - return 0 - - execute_lilo(lilo, device) - install_syslinux_mbr(device) - - def is_writeable(device): """Check if the device is writeable for the current user @@ -1255,7 +1177,6 @@ def copy_bootloader_files(iso_mount, target, grml_flavour): logging.critical("Fatal: file default.cfg could not be found.") logging.critical("Note: this grml2usb version requires an ISO generated by grml-live >=0.9.24 ...") logging.critical(" ... either use grml releases >=2009.10 or switch to an older grml2usb version.") - logging.critical(" Please visit http://grml.org/grml2usb/#grml2usb-compat for further information.") raise for expr in name, 'distri.cfg', \ @@ -1800,23 +1721,24 @@ def handle_mbr(device): if device[-1:].isdigit(): mbr_device = re.match(r'(.*?)\d*$', device).group(1) partition_number = int(device[-1:]) - 1 - skip_install_mir_mbr = False + else: + 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 if mbr_device == "/dev/loop": mbr_device = device logging.info("Detected loop device - using %s as MBR device therefore", mbr_device) - skip_install_mir_mbr = True + + mbrcode = GRML2USB_BASE + '/mbr/mbrldr' + if options.syslinuxmbr: + mbrcode = '/usr/lib/syslinux/mbr.bin' + elif options.mbrmenu: + mbrcode = GRML2USB_BASE + '/mbr/mbrldr' try: - if options.syslinuxmbr: - handle_syslinux_mbr(mbr_device) - elif not skip_install_mir_mbr: - if options.mbrmenu: - install_mir_mbr(GRML2USB_BASE + '/mbr/mbrmgr', mbr_device, partition_number, True) - else: - install_mir_mbr(GRML2USB_BASE + '/mbr/mbrldr', mbr_device, partition_number, False) + install_mbr(mbrcode, mbr_device, partition_number, True) except IOError, error: logging.critical("Execution failed: %s", error) sys.exit(1) @@ -1980,10 +1902,6 @@ def main(): if int(device[-1:]) > 4 or device[-2:].isdigit(): logging.critical("Fatal: installation on partition number >4 not supported. (BIOS won't support it.)") sys.exit(1) - elif os.path.exists(device): - logging.critical("Fatal: installation on raw device not supported. (BIOS won't support it.)") - sys.exit(1) - # provide upgrade path handle_compat_warning(device) @@ -1996,7 +1914,11 @@ def main(): install(iso, device) # install mbr - if not options.skipmbr and not os.path.isdir(device): + is_superfloppy = not device[-1:].isdigit() + if is_superfloppy: + logging.info("Detected superfloppy format - not installing MBR") + + if not options.skipmbr and not os.path.isdir(device) and not is_superfloppy: handle_mbr(device) handle_bootloader(device)