X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=3909e2ecf8c6aaf78896826371cd7c6a6bff8c28;hp=982623fbfb8b3f515551d958f397725779d82748;hb=b85e41124e1845c604af5e619b70e1e5c8edcdce;hpb=c5336118ff9281c2c23b77b1e9bcfe3ebe45e864 diff --git a/grml2usb b/grml2usb index 982623f..3909e2e 100755 --- a/grml2usb +++ b/grml2usb @@ -223,6 +223,7 @@ def generate_main_grub2_config(grml_flavour, install_partition, bootoptions): local_datestamp = DATESTAMP return("""\ +## main grub2 configuration - generated by grml2usb [main config generated at: %(local_datestamp)s] set default=0 set timeout=5 @@ -237,7 +238,6 @@ else set menu_color_highlight=white/blue fi -## main grub2 configuration - generated by grml2usb [main config generated at: %(local_datestamp)s] menuentry "%(grml_flavour)s (default)" { set root=(hd0,%(install_partition)s) linux /boot/release/%(grml_flavour)s/linux26 apm=power-off lang=us vga=791 quiet boot=live nomce module=%(grml_flavour)s %(bootoptions)s @@ -363,12 +363,14 @@ splashimage=/boot/grub/splash.xpm.gz foreground = 000000 background = FFCC33 +# root=(hd0,%(install_partition)s) + # define entries: title %(grml_flavour)s - Default boot (using 1024x768 framebuffer) kernel /boot/release/%(grml_flavour)s/linux26 apm=power-off lang=us vga=791 quiet boot=live nomce module=%(grml_flavour)s initrd /boot/release/%(grml_flavour)s/initrd.gz -""" % {'grml_flavour': grml_flavour, 'local_datestamp': local_datestamp, 'bootoptions': bootoptions} ) +""" % {'grml_flavour': grml_flavour, 'local_datestamp': local_datestamp, 'bootoptions': bootoptions, 'install_partition': install_partition } ) def generate_isolinux_splash(grml_flavour): @@ -508,7 +510,7 @@ def install_grub(device): try: mount(device, device_mountpoint, "") logging.debug("grub-install --root-directory=%s %s", device_mountpoint, device) - proc = subprocess.Popen(["grub-install", "--root-directory=%s" % device_mountpoint, device]) + proc = subprocess.Popen(["grub-install", "--root-directory=%s" % device_mountpoint, device], stdout=file(os.devnull, "r+")) proc.wait() if proc.returncode != 0: raise Exception("error executing grub-install") @@ -567,13 +569,6 @@ def install_bootloader(device): def install_lilo_mbr(lilo, device): """TODO""" - # TODO: check out the *real* difference between: - # * mbr-install /dev/ice - # * lilo -S /dev/null -M /dev/ice ext && lilo -S /dev/null -A /dev/ice 1 - # * cat /usr/lib/syslinux/mbr.bin > /dev/ice - # * syslinux -sf /dev/iceX - # * ...? - # to support -A for extended partitions: logging.info("Installing MBR") logging.debug("%s -S /dev/null -M %s ext" % (lilo, device)) @@ -607,6 +602,76 @@ def install_syslinux_mbr(device): logging.critical("Execution failed:", error) +def InstallMBR(mbrtemplate, device, partition, ismirbsdmbr=True): + """Installs an MBR to a device. + + Retrieve the partition table from "device", install an MBR from + the "mbrtemplate" file, set the "partition" (0..3) active, and + install the result back to "device". + + "device" may be the name of a file assumed to be a hard disc + (or USB stick) image, or something like "/dev/sdb". "partition" + must be a number between 0 and 3, inclusive. "mbrtemplate" must + be a valid MBR file of at least 440 (439 if ismirbsdmbr) bytes. + + If "ismirbsdmbr", the partitions' active flags are not changed. + Instead, the MBR's default value is set accordingly. + """ + + if (partition < 0) or (partition > 3): + raise ValueError("partition must be between 0 and 3") + + if ismirbsdmbr: + nmbrbytes = 439 + else: + nmbrbytes = 440 + + tmpf = tempfile.NamedTemporaryFile() + + 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)") + # os.system("dd if='%s' of='%s' bs=512 count=1" % (device, tmpf.name)) + + 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() + if proc.returncode != 0: + raise Exception("error executing dd (second run)") + # os.system("dd if='%s' of='%s' bs=%d count=1 conv=notrunc" % (mbrtemplate, tmpf.name, nmbrbytes)) + + mbrcode = tmpf.file.read(512) + 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" + + tmpf.file.seek(0) + tmpf.file.truncate() + tmpf.file.write(mbrcode) + tmpf.file.close() + + #os.system("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, "/tmp/mbr")) + proc = subprocess.Popen(["dd", "if=%s" % tmpf.name, "of=%s" % "/tmp/mbr", "bs=512", "count=1", "conv=notrunc"], stderr=file(os.devnull, "r+")) + proc.wait() + if proc.returncode != 0: + raise Exception("error executing dd (third run)") + # os.system("dd if='%s' of='%s' bs=512 count=1 conv=notrunc" % (tmpf.name, "/tmp/mbr")) + del tmpf + def install_mbr(device): """Install a default master boot record on given device @@ -662,7 +727,7 @@ def mount(source, target, mount_options): @target: directory where the ISO should be mounted to @options: mount specific options""" - # notice: options.dryrun does not work here, as we have to + # note: options.dryrun does not work here, as we have to # locate files and identify the grml flavour logging.debug("mount %s %s %s" % (mount_options, source, target)) proc = subprocess.Popen(["mount"] + list(mount_options) + [source, target]) @@ -729,7 +794,7 @@ def check_for_fat(partition): if udev_info.returncode == 2: raise CriticalException("Failed to read device %s" - "(wrong UID/permissions or device not present?)" % partition) + " (wrong UID/permissions or device not present?)" % partition) if filesystem != "vfat": raise CriticalException("Device %s does not contain a FAT16 partition." % partition) @@ -921,7 +986,6 @@ def install_iso_files(grml_flavour, iso_mount, device, target): # * make sure grml_flavour, iso_mount, target are set when the function is called, otherwise raise exception # * provide alternative search_file() if file information is stored in a config.ini file? # * catch "install: .. No space left on device" & CO - # * abstract copy logic to make the code shorter and get rid of spaghettis ;) if options.dryrun: logging.info("Would copy files to %s", iso_mount) @@ -938,7 +1002,7 @@ def install_iso_files(grml_flavour, iso_mount, device, target): copy_bootloader_files(iso_mount, target) if not options.dryrun: - handle_bootloader_config(grml_flavour, device, target) # FIXME + handle_bootloader_config(grml_flavour, device, target) # make sure we sync filesystems before returning proc = subprocess.Popen(["sync"]) @@ -978,9 +1042,8 @@ def identify_grml_flavour(mountpath): return grml_flavour - -def handle_bootloader_config(grml_flavour, device, target): - """TODO""" +def handle_grub_config(grml_flavour, device, target): + """ TODO """ logging.debug("Generating grub configuration") #with open("...", "w") as f: @@ -994,11 +1057,10 @@ def handle_bootloader_config(grml_flavour, device, target): install_partition = device[-1:] # grub1 config - logging.debug("Creating grub1 configuration file") - grub_config_file = open(grub_target + 'menu.lst', 'w') - grub_config_file.write(generate_grub1_config(grml_flavour, install_partition, options.bootoptions)) - grub_config_file.close() - + #logging.debug("Creating grub1 configuration file") + #grub_config_file = open(grub_target + 'menu.lst', 'w') + #grub_config_file.write(generate_grub1_config(grml_flavour, install_partition, options.bootoptions)) + #grub_config_file.close() # TODO => generate_main_grub1_config() && generate_flavour_specific_grub1_config() # grub2 config @@ -1011,7 +1073,7 @@ def handle_bootloader_config(grml_flavour, device, target): main_identifier = re.compile(".*main config generated at: %s.*" % re.escape(str(DATESTAMP))) if not re.match(main_identifier, string): grub2_config_file = open(grub2_cfg, 'w') - logging.info("Notice: grml flavour %s is being installed as the default booting system." % grml_flavour) + logging.info("Note: grml flavour %s is being installed as the default booting system." % grml_flavour) grub2_config_file.write(generate_main_grub2_config(grml_flavour, install_partition, options.bootoptions)) grub2_config_file.close() else: @@ -1022,7 +1084,7 @@ def handle_bootloader_config(grml_flavour, device, target): grub_flavour_config = True if os.path.isfile(grub2_cfg): string = open(grub2_cfg).readlines() - logging.info("Notice: you can boot flavour %s using '%s' on the commandline." % (grml_flavour, grml_flavour)) + logging.info("Note: you can boot flavour %s using '%s' on the commandline." % (grml_flavour, grml_flavour)) flavour = re.compile("grml2usb for %s: %s" % (re.escape(grml_flavour), re.escape(str(DATESTAMP)))) for line in string: if flavour.match(line): @@ -1034,6 +1096,10 @@ def handle_bootloader_config(grml_flavour, device, target): grub2_config_file.close( ) +def handle_syslinux_config(grml_flavour, target): + """ TODO + """ + logging.info("Generating syslinux configuration") syslinux_target = target + '/boot/syslinux/' # should be present via copy_bootloader_files(), but make sure it exits: @@ -1046,7 +1112,7 @@ def handle_bootloader_config(grml_flavour, device, target): main_identifier = re.compile(".*main config generated at: %s.*" % re.escape(str(DATESTAMP))) if not re.match(main_identifier, string): syslinux_config_file = open(syslinux_cfg, 'w') - logging.info("Notice: grml flavour %s is being installed as the default booting system." % grml_flavour) + logging.info("Note: grml flavour %s is being installed as the default booting system." % grml_flavour) syslinux_config_file.write(generate_main_syslinux_config(grml_flavour, options.bootoptions)) syslinux_config_file.close() else: @@ -1059,7 +1125,7 @@ def handle_bootloader_config(grml_flavour, device, target): syslinux_flavour_config = True if os.path.isfile(syslinux_cfg): string = open(syslinux_cfg).readlines() - logging.info("Notice: you can boot flavour %s using '%s' on the commandline." % (grml_flavour, grml_flavour)) + logging.info("Note: you can boot flavour %s using '%s' on the commandline." % (grml_flavour, grml_flavour)) flavour = re.compile("grml2usb for %s: %s" % (re.escape(grml_flavour), re.escape(str(DATESTAMP)))) for line in string: if flavour.match(line): @@ -1076,6 +1142,15 @@ def handle_bootloader_config(grml_flavour, device, target): isolinux_splash.close( ) +def handle_bootloader_config(grml_flavour, device, target): + """TODO""" + + if options.grub: + handle_grub_config(grml_flavour, device, target) + else: + handle_syslinux_config(grml_flavour, target) + + def handle_iso(iso, device): """Main logic for mounting ISOs and copying files. @@ -1158,9 +1233,11 @@ def handle_mbr(device): if not options.skipmbr: if device[-1:].isdigit(): mbr_device = re.match(r'(.*?)\d*$', device).group(1) + partition_number = int(device[-1:]) - 1 try: - install_mbr(mbr_device) + # install_mbr(mbr_device) + InstallMBR('/usr/share/grml2usb/mbr/mbrmgr', mbr_device, partition_number, True) except IOError, error: logging.critical("Execution failed: %s", error) sys.exit(1) @@ -1266,6 +1343,14 @@ def main(): device = args[len(args) - 1] isos = args[0:len(args) - 1] + if device[-1:].isdigit(): + if int(device[-1:]) > 4: + logging.critical("Fatal: installation on partition number >4 not supported. (As the BIOS won't support it.)") + sys.exit(1) + else: + logging.critical("Fatal: installation on raw device not supported. (As the BIOS won't support it.)") + sys.exit(1) + # provide upgrade path handle_compat_warning(device)