X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=217020dedcf6bdc6b8c72dd63a3003c008d7ab96;hp=b84165e899879ef640353b7f27295b71deb192e9;hb=5d028a0bf6d7dd63f8e897013f7530185ea6a85c;hpb=eb1a910784ceae1d11c08871cabd9d4c8a2a8cd0 diff --git a/grml2usb b/grml2usb index b84165e..217020d 100755 --- a/grml2usb +++ b/grml2usb @@ -7,7 +7,7 @@ grml2usb This script installs a grml system (either a running system or ISO[s]) to a USB device -:copyright: (c) 2009 by Michael Prokop +:copyright: (c) 2009, 2010, 2011 by Michael Prokop :license: GPL v2 or any later version :bugreports: http://grml.org/bugs/ @@ -22,7 +22,7 @@ import uuid import struct # global variables -PROG_VERSION = "0.9.28" +PROG_VERSION = "0.9.31" MOUNTED = set() # register mountpoints TMPFILES = set() # register tmpfiles DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg @@ -60,7 +60,7 @@ Run %prog --help for usage hints, further information via: man grml2usb" # pylint: disable-msg=W0603 parser = OptionParser(usage=USAGE) parser.add_option("--bootoptions", dest="bootoptions", - action="store", type="string", + action="append", type="string", help="use specified bootoptions as default") parser.add_option("--bootloader-only", dest="bootloaderonly", action="store_true", help="do not copy files but just install a bootloader") @@ -324,7 +324,7 @@ if loadfont /boot/grub/ascii.pf2 ; then set gfxmode=640x480 insmod gfxterm insmod vbe - if terminal_output.gfxterm ; then true ; else + if terminal_output gfxterm ; then true ; else # For backward compatibility with versions of terminal.mod that don't # understand terminal_output terminal gfxterm @@ -479,107 +479,6 @@ menuentry "%(grml_flavour)s-forensic - do not touch harddisks during hw recogn 'flavour_filename': grml_flavour.replace('-', ''), 'uid': UUID, 'bootoptions': bootoptions } ) - -def generate_flavour_specific_grub1_config(grml_flavour, install_partition, bootoptions): - """Generate grub1 configuration for use via menu.lst - - @grml_flavour: name of grml flavour the configuration should be generated for - @install_partition: partition number for use in (hd0,X) - @bootoptions: additional bootoptions that should be used by default""" - - local_datestamp = DATESTAMP - - return("""\ -## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] -title %(grml_flavour)s -kernel (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce vga=791 quiet live-media-path=/live/%(grml_flavour)s/ bootid=%(uid)s %(bootoptions)s -initrd (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/initrd.gz - -## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] -title %(grml_flavour)s-persistent -kernel (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce vga=791 quiet persistent live-media-path=/live/%(grml_flavour)s/ bootid=%(uid)s %(bootoptions)s -initrd (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/initrd.gz - -## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] -title %(grml_flavour)s2ram -kernel (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce vga=791 quiet live-media-path=/live/%(grml_flavour)s/ toram=%(grml_flavour)s.squashfs bootid=%(uid)s %(bootoptions)s -initrd (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/initrd.gz - -## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] -title %(grml_flavour)s-debug -kernel (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce vga=791 quiet live-media-path=/live/%(grml_flavour)s/ debug initcall_debug bootid=%(uid)s %(bootoptions)s -initrd (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/initrd.gz - -## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] -title %(grml_flavour)s-x -kernel (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce vga=791 quiet live-media-path=/live/%(grml_flavour)s/ startx=wm-ng bootid=%(uid)s %(bootoptions)s -initrd (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/initrd.gz - -## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] -title %(grml_flavour)s-nofb -kernel (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ vga=normal video=ofonly bootid=%(uid)s %(bootoptions)s -initrd (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/initrd.gz - -## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] -title %(grml_flavour)s-failsafe -kernel (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ vga=normal noautoconfig atapicd noapic noacpi acpi=off nomodules nofirewire noudev nousb nohotplug noapm nopcmcia nosmp maxcpus=0 noscsi noagp nodma ide=nodma noswap nofstab nosound nogpm nosyslog nodhcp nocpu nodisc nomodem xmodule=vesa noraid nolvm noresume selinux=0 edd=off pci=nomsi bootid=%(uid)s %(bootoptions)s -initrd (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/initrd.gz - -## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] -title %(grml_flavour)s-forensic -kernel (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce vga=791 quiet live-media-path=/live/%(grml_flavour)s/ nofstab noraid nolvm noautoconfig noswap raid=noautodetect forensic readonly bootid=%(uid)s %(bootoptions)s -initrd (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/initrd.gz - -## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] -title %(grml_flavour)s-serial -kernel (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ vga=normal video=vesafb:off console=tty1 console=ttyS0,9600n8 bootid=%(uid)s %(bootoptions)s -initrd (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/initrd.gz - -""" % {'grml_flavour': grml_flavour, 'local_datestamp': local_datestamp, - 'flavour_filename': grml_flavour.replace('-', ''), 'uid': UUID, - 'bootoptions': bootoptions, 'install_partition': install_partition } ) - - -def generate_main_grub1_config(grml_flavour, install_partition, bootoptions): - """Generate grub1 configuration for use via menu.lst - - @grml_flavour: name of grml flavour the configuration should be generated for""" - - local_datestamp = DATESTAMP - - return("""\ -## main grub1 configuration - generated by grml2usb [main config generated at: %(local_datestamp)s] -# misc options: -timeout 30 -# color red/blue green/black -splashimage=(hd0,%(install_partition)s)/boot/grub/splash.xpm.gz -foreground = 000000 -background = FFCC33 - -# define entries: -title %(grml_flavour)s - Default boot (using 1024x768 framebuffer) -kernel (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/linux26 apm=power-off vga=791 quiet boot=live nomce live-media-path=/live/%(grml_flavour)s/ bootid=%(uid)s %(bootoptions)s -initrd (hd0,%(install_partition)s)/boot/release/%(flavour_filename)s/initrd.gz - -title Memory test (memtest86+) -kernel (hd0,%(install_partition)s)/boot/addons/memtest - -title Grub - all in one image -kernel (hd0,%(install_partition)s)/boot/addons/memdisk -initrd (hd0,%(install_partition)s)/boot/addons/allinone.img - -title FreeDOS -kernel (hd0,%(install_partition)s)/boot/addons/memdisk -initrd (hd0,%(install_partition)s)/boot/addons/balder10.imz - -title MirOS BSD -kernel (hd0,%(install_partition)s)/boot/addons/bsd4grml/ldbsd.com - -""" % {'grml_flavour': grml_flavour, 'local_datestamp': local_datestamp, - 'flavour_filename': grml_flavour.replace('-', ''), 'uid': UUID, - 'bootoptions': bootoptions, 'install_partition': install_partition } ) - - def generate_isolinux_splash(grml_flavour): """Generate bootsplash for isolinux/syslinux @@ -1102,7 +1001,8 @@ def copy_system_files(grml_flavour, iso_mount, target): squashfs = search_file(grml_flavour + '.squashfs', iso_mount) if squashfs is None: - logging.critical("Fatal: squashfs file not found") + logging.critical("Fatal: squashfs file not found" + ", please check that your iso is not corrupt") raise CriticalException("error locating squashfs file") else: squashfs_target = target + '/live/' + grml_flavour + '/' @@ -1159,22 +1059,30 @@ def update_grml_versions(iso_mount, target): logging.warn("Warning: %s could not be found - can not install it", iso_grml_version_file) return False try: + # read the flavours from the iso image iso_versions = {} iso_file = open(iso_grml_version_file, 'r') for line in iso_file: iso_versions[get_flavour(line)] = line.strip() + # update the existing flavours on the target for line in fileinput.input([target_grml_version_file], inplace=1): flavour = get_flavour(line) if flavour in iso_versions.keys(): - print iso_versions[flavour] + print iso_versions.pop(flavour) else: print line.strip() + fileinput.close() + + target_file = open(target_grml_version_file, 'a') + # add the new flavours from the current iso + for flavour in iso_versions: + target_file.write("%s\n" % iso_versions[flavour]) except IOError: logging.warn("Warning: Could not write file") finally: iso_file.close() - fileinput.close() + target_file.close() return True else: return False @@ -1196,7 +1104,7 @@ def copy_grml_files(iso_mount, target): for myfile in copy_files: grml_file = search_file(myfile, iso_mount) if grml_file is None: - logging.warn("Warning: myfile %s could not be found - can not install it", myfile) + logging.warn("Warning: file %s could not be found - can not install it", myfile) else: exec_rsync(grml_file, grml_target + myfile) @@ -1206,7 +1114,7 @@ def copy_grml_files(iso_mount, target): for myfile in 'index.html', 'style.css': grml_file = search_file(myfile, iso_mount) if grml_file is None: - logging.warn("Warning: myfile %s could not be found - can not install it") + logging.warn("Warning: file %s could not be found - can not install it", myfile) else: exec_rsync(grml_file, grml_web_target + myfile) @@ -1216,21 +1124,23 @@ def copy_grml_files(iso_mount, target): for myfile in 'button.png', 'favicon.png', 'linux.jpg', 'logo.png': grml_file = search_file(myfile, iso_mount) if grml_file is None: - logging.warn("Warning: myfile %s could not be found - can not install it") + logging.warn("Warning: file %s could not be found - can not install it", myfile) else: exec_rsync(grml_file, grml_webimg_target + myfile) -def handle_addon_copy(filename, dst, iso_mount): +def handle_addon_copy(filename, dst, iso_mount, ignore_errors=False): """handle copy of optional addons @filename: filename of the addon @dst: destination directory @iso_mount: location of the iso mount + @ignore_errors: don't report missing files """ file_location = search_file(filename, iso_mount) if file_location is None: - logging.warn("Warning: %s not found (that's fine if you don't need it)", filename) + if not ignore_errors: + logging.warn("Warning: %s not found (that's fine if you don't need it)", filename) else: exec_rsync(file_location, dst) @@ -1270,9 +1180,11 @@ def copy_addons(iso_mount, target): # memtest86+ image handle_addon_copy('memtest', addons, iso_mount) - # gpxe.lkrn - handle_addon_copy('gpxe.lkrn', addons, iso_mount) + # gpxe.lkrn: got replaced by ipxe + handle_addon_copy('gpxe.lkrn', addons, iso_mount, ignore_errors=True) + # ipxe.lkrn + handle_addon_copy('ipxe.lkrn', addons, iso_mount) def glob_and_copy(filepattern, dst): """Glob on specified filepattern and copy the result to dst @@ -1478,55 +1390,6 @@ def modify_grub_config(filename): fileinput.close() -def handle_grub1_config(grml_flavour, install_partition, grub_target, bootopt): - """Main handler for generating grub1 configuration - - @grml_flavour: name of grml flavour the configuration should be generated for - @install_partition: partition number for use in (hd0,X) - @grub_target: path of grub's configuration files - @bootoptions: additional bootoptions that should be used by default""" - - # grub1 config - grub1_cfg = grub_target + 'menu.lst' - logging.debug("Creating grub1 configuration file (menu.lst)") - - # install main configuration only *once*, no matter how many ISOs we have: - if os.path.isfile(grub1_cfg): - string = open(grub1_cfg).readline() - main_identifier = re.compile(".*main config generated at: %s.*" % re.escape(str(DATESTAMP))) - if not re.match(main_identifier, string): - grub1_config_file = open(grub1_cfg, 'w') - grub1_config_file.write(generate_main_grub1_config(grml_flavour, install_partition, bootopt)) - grub1_config_file.close() - else: - grub1_config_file = open(grub1_cfg, 'w') - grub1_config_file.write(generate_main_grub1_config(grml_flavour, install_partition, bootopt)) - grub1_config_file.close() - - grub_flavour_config = True - if os.path.isfile(grub1_cfg): - string = open(grub1_cfg).readlines() - flavour = re.compile("grml2usb for %s: %s" % (re.escape(grml_flavour), re.escape(str(DATESTAMP)))) - for line in string: - if flavour.match(line): - grub_flavour_config = False - - if grub_flavour_config: - grub1_config_file = open(grub1_cfg, 'a') - grub1_config_file.write(generate_flavour_specific_grub1_config(grml_flavour, install_partition, bootopt)) - grub1_config_file.close() - - modify_grub_config(grub1_cfg) - - # make sure grub.conf isn't a symlink but a plain file instead, - # otherwise it will break on FAT16 filesystems - # this works around grub-install of (at least) Fedora 10 - if os.path.isfile(grub1_cfg): - grubconf = grub_target + 'grub.conf' - if not os.path.islink(grubconf): - import shutil - shutil.copyfile(grub1_cfg, grub_target + 'grub.conf') - def handle_grub2_config(grml_flavour, grub_target, bootopt): """Main handler for generating grub2 configuration @@ -1584,10 +1447,10 @@ def get_bootoptions(grml_flavour): @grml_flavour: name of the grml_flavour """ # do NOT write "None" in kernel cmdline - if options.bootoptions is None: + if not options.bootoptions: bootopt = "" else: - bootopt = options.bootoptions + bootopt = " ".join(options.bootoptions) bootopt = bootopt.replace("%flavour", grml_flavour) return bootopt @@ -1603,19 +1466,8 @@ def handle_grub_config(grml_flavour, device, target): grub_target = target + '/boot/grub/' - if os.path.isdir(device): - install_grub1_partition = None - else: - if device[-1:].isdigit(): - install_grub1_partition = int(device[-1:]) - 1 - else: - raise CriticalException("error validating partition schema (raw device?)") - - bootopt = get_bootoptions(grml_flavour) - # write menu.lst - handle_grub1_config(grml_flavour, install_grub1_partition, grub_target, bootopt) # write grub.cfg handle_grub2_config(grml_flavour, grub_target, bootopt) @@ -1871,7 +1723,7 @@ def install(image, device): register_tmpfile(iso_mountpoint) remove_image_mountpoint = True try: - mount(image, iso_mountpoint, ["-o", "loop", "-t", "iso9660"]) + mount(image, iso_mountpoint, ["-o", "loop,ro", "-t", "iso9660"]) except CriticalException, error: logging.critical("Fatal: %s", error) sys.exit(1) @@ -1914,6 +1766,8 @@ def install_grml(mountpoint, device): try: grml_flavours = identify_grml_flavour(mountpoint) for flavour in set(grml_flavours): + if not flavour: + logging.warning("No valid flavour found, please check your iso") logging.info("Identified grml flavour \"%s\".", flavour) install_iso_files(flavour, mountpoint, device, device_mountpoint) GRML_FLAVOURS.add(flavour)