From: Christian Hofstaedtler <ch@grml.org>
Date: Wed, 21 Dec 2011 02:41:56 +0000 (+0100)
Subject: Fix add/remove bootoptions with new kernel/initrd names
X-Git-Tag: v0.11.3~6
X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=commitdiff_plain;h=5818eec7811558140bd19aa8b1a3378789f3803f;ds=inline

Fix add/remove bootoptions with new kernel/initrd names
---

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))