X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=b36798acc5d22abe982de0f0cca50aa8d7e68139;hp=0233eda0cb332822e2db92e7bf39bb152e81a670;hb=5818eec7811558140bd19aa8b1a3378789f3803f;hpb=e9f7cff24f4a6bc4d1de33897d634c429707e7f9 diff --git a/grml2usb b/grml2usb index 0233eda..b36798a 100755 --- a/grml2usb +++ b/grml2usb @@ -21,8 +21,10 @@ import glob import uuid import struct +# The line following this line is patched by debian/rules and tarball.sh. +PROG_VERSION='***UNRELEASED***' + # global variables -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 @@ -339,7 +341,7 @@ fi menuentry "%(grml_flavour)s (default)" { set gfxpayload=1024x768x16,1024x768 - linux /boot/release/%(flavour_filename)s/linux26 apm=power-off quiet boot=live nomce live-media-path=/live/%(grml_flavour)s/ bootid=%(uid)s %(bootoptions)s + linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce live-media-path=/live/%(grml_flavour)s/ bootid=%(uid)s %(bootoptions)s initrd /boot/release/%(flavour_filename)s/initrd.gz } @@ -422,60 +424,54 @@ def generate_flavour_specific_grub2_config(grml_flavour, bootoptions): ## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] menuentry "%(grml_flavour)s - boot in default mode" { set gfxpayload=1024x768x16,1024x768 - linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ bootid=%(uid)s %(bootoptions)s + linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce live-media-path=/live/%(grml_flavour)s/ bootid=%(uid)s %(bootoptions)s initrd /boot/release/%(flavour_filename)s/initrd.gz } ## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] menuentry "%(grml_flavour)s - enable persistent mode" { set gfxpayload=1024x768x16,1024x768 - linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet persistent live-media-path=/live/%(grml_flavour)s/ bootid=%(uid)s %(bootoptions)s + linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce persistent live-media-path=/live/%(grml_flavour)s/ bootid=%(uid)s %(bootoptions)s initrd /boot/release/%(flavour_filename)s/initrd.gz } ## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] menuentry "%(grml_flavour)s - copy Grml to RAM" { set gfxpayload=1024x768x16,1024x768 - linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ toram=%(grml_flavour)s.squashfs bootid=%(uid)s %(bootoptions)s + linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce live-media-path=/live/%(grml_flavour)s/ toram=%(grml_flavour)s.squashfs bootid=%(uid)s %(bootoptions)s initrd /boot/release/%(flavour_filename)s/initrd.gz } ## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] menuentry "%(grml_flavour)s - start X Window System" { set gfxpayload=1024x768x16,1024x768 - linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ startx bootid=%(uid)s %(bootoptions)s + linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce live-media-path=/live/%(grml_flavour)s/ startx bootid=%(uid)s %(bootoptions)s initrd /boot/release/%(flavour_filename)s/initrd.gz } ## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] menuentry "%(grml_flavour)s - disable framebuffer" { - linux /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 + linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce live-media-path=/live/%(grml_flavour)s/ vga=normal video=ofonly bootid=%(uid)s %(bootoptions)s initrd /boot/release/%(flavour_filename)s/initrd.gz } ## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] menuentry "%(grml_flavour)s - disable Kernel Mode-Setting" { - linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ bootid=%(uid)s %(bootoptions)s radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset + linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce live-media-path=/live/%(grml_flavour)s/ bootid=%(uid)s %(bootoptions)s radeon.modeset=0 i915.modeset=0 nouveau.modeset=0 nomodeset initrd /boot/release/%(flavour_filename)s/initrd.gz } ## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] menuentry "%(grml_flavour)s - forensic mode" { set gfxpayload=1024x768x16,1024x768 - linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ nofstab noraid nolvm noautoconfig noswap raid=noautodetect forensic readonly bootid=%(uid)s %(bootoptions)s - initrd /boot/release/%(flavour_filename)s/initrd.gz -} - -## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] -menuentry "%(grml_flavour)s - disable hardware detection" { - linux /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 + linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce live-media-path=/live/%(grml_flavour)s/ nofstab noraid nolvm noautoconfig noswap raid=noautodetect forensic readonly bootid=%(uid)s %(bootoptions)s initrd /boot/release/%(flavour_filename)s/initrd.gz } ## flavour specific configuration for %(grml_flavour)s [grml2usb for %(grml_flavour)s: %(local_datestamp)s] menuentry "%(grml_flavour)s - enable debugging options" { set gfxpayload=1024x768x16,1024x768 - linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce quiet live-media-path=/live/%(grml_flavour)s/ debug bootid=%(uid)s initcall_debug %(bootoptions)s + linux /boot/release/%(flavour_filename)s/linux26 apm=power-off boot=live nomce live-media-path=/live/%(grml_flavour)s/ debug bootid=%(uid)s initcall_debug %(bootoptions)s initrd /boot/release/%(flavour_filename)s/initrd.gz } @@ -956,19 +952,19 @@ def copy_system_files(grml_flavour, iso_mount, target): if os.path.isdir(iso_mount + '/boot/release'): prefix = release_path + '/' - kernel = search_file(prefix + 'linux26', iso_mount) + kernel = search_file(prefix + 'vmlinuz', iso_mount) + initrd = search_file(prefix + 'initrd.img', iso_mount) if kernel is None: - logging.critical("Fatal kernel not found") - raise CriticalException("error locating kernel file") - else: - exec_rsync(kernel, release_target + '/linux26') + # compat for releases < 2011.12 + kernel = search_file(prefix + 'linux26', iso_mount) + initrd = search_file(prefix + 'initrd.gz', iso_mount) - initrd = search_file(prefix + 'initrd.gz', iso_mount) - if initrd is None: - logging.critical("Fatal: initrd not found") - raise CriticalException("error locating initrd file") - else: - exec_rsync(initrd, release_target + '/initrd.gz') + if kernel is None or initrd is None: + logging.critical("Fatal: kernel or initrd not found") + raise CriticalException("error locating kernel or initrd file") + + exec_rsync(kernel, release_target + '/') + exec_rsync(initrd, release_target + '/') def update_grml_versions(iso_mount, target): @@ -1208,27 +1204,12 @@ def copy_bootloader_files(iso_mount, target, grml_flavour): search_and_copy('hidden.cfg', iso_mount + source_dir, syslinux_target + "new_" + 'hidden.cfg') - - grub_target = target + '/boot/grub/' - execute(mkdir, grub_target) - - if not os.path.isfile(GRML2USB_BASE + "/grub/splash.xpm.gz"): - logging.critical("Error: %s/grub/splash.xpm.gz can not be read.", GRML2USB_BASE) - logging.critical("Please make sure you've installed the grml2usb (Debian) package!") - raise - else: - exec_rsync(GRML2USB_BASE + '/grub/splash.xpm.gz', grub_target + 'splash.xpm.gz') - - # grml splash in grub - copy_if_exist(GRML2USB_BASE + "/grub/grml.png", grub_target + 'grml.png') - - # font file for graphical bootsplash in grub - copy_if_exist('/usr/share/grub/ascii.pf2', grub_target + 'ascii.pf2') - - # always copy grub content as it might be useful - + # copy all grub files from ISO glob_and_copy(iso_mount + '/boot/grub/*.mod', grub_target) + glob_and_copy(iso_mount + '/boot/grub/*.lst', grub_target) glob_and_copy(iso_mount + '/boot/grub/*.img', grub_target) + glob_and_copy(iso_mount + '/boot/grub/*.pf2', grub_target) # fonts for splash + glob_and_copy(iso_mount + '/boot/grub/*.png', grub_target) # splash image glob_and_copy(iso_mount + '/boot/grub/stage*', grub_target) def install_iso_files(grml_flavour, iso_mount, device, target): @@ -1314,7 +1295,7 @@ def modify_grub_config(filename): for regex in options.removeoption: regexe.append(re.compile(r'%s' % regex)) - option_re = re.compile(r'(.*/boot/release/.*linux26.*)') + option_re = re.compile(r'(.*/boot/release/.*(linux26|vmlinuz).*)') for line in fileinput.input(filename, inplace=1): if regexe and option_re.search(line): @@ -1339,20 +1320,15 @@ def handle_grub2_config(grml_flavour, grub_target, bootopt): global GRML_DEFAULT # install main configuration only *once*, no matter how many ISOs we have: - grub_flavour_is_default = False + install_main_config = True if os.path.isfile(grub2_cfg): string = open(grub2_cfg).readline() 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') - GRML_DEFAULT = grml_flavour - grub_flavour_is_default = True - grub2_config_file.write(generate_main_grub2_config(grml_flavour, bootopt)) - grub2_config_file.close() - else: + if re.match(main_identifier, string): + install_main_config = False + if install_main_config: grub2_config_file = open(grub2_cfg, 'w') GRML_DEFAULT = grml_flavour - grub_flavour_is_default = True grub2_config_file.write(generate_main_grub2_config(grml_flavour, bootopt)) grub2_config_file.close() @@ -1368,7 +1344,7 @@ def handle_grub2_config(grml_flavour, grub_target, bootopt): if grub_flavour_config: grub2_config_file = open(grub2_cfg, 'a') # display only if the grml flavour isn't the default - if not grub_flavour_is_default: + if GRML_DEFAULT != grml_flavour: GRML_FLAVOURS.add(grml_flavour) grub2_config_file.write(generate_flavour_specific_grub2_config(grml_flavour, bootopt)) grub2_config_file.close() @@ -1467,7 +1443,7 @@ def adjust_syslinux_bootoptions(src, flavour): regexe = [] option_re = None if options.removeoption: - option_re = re.compile(r'/boot/release/.*/initrd.gz') + option_re = re.compile(r'/boot/release/.*/(initrd.gz|initrd.img)') for regex in options.removeoption: regexe.append(re.compile(r'%s' % regex))