projects
/
grml2usb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix add/remove bootoptions with new kernel/initrd names
[grml2usb.git]
/
grml2usb
diff --git
a/grml2usb
b/grml2usb
index
70fbfe1
..
b36798a
100755
(executable)
--- 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))
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):
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:
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))
for regex in options.removeoption:
regexe.append(re.compile(r'%s' % regex))