From 5818eec7811558140bd19aa8b1a3378789f3803f Mon Sep 17 00:00:00 2001 From: Christian Hofstaedtler Date: Wed, 21 Dec 2011 03:41:56 +0100 Subject: [PATCH] Fix add/remove bootoptions with new kernel/initrd names --- grml2usb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grml2usb b/grml2usb index 70fbfe1..b36798a 100755 --- a/grml2usb +++ b/grml2usb @@ -1295,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): @@ -1443,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)) -- 2.1.4