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):
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))
data.close()
def modify_filenames(grml_flavour, target, filenames):
- """Replace the standarf filenames with the new ones
+ """Replace the standard filenames with the new ones
@grml_flavour: grml-flavour strin
@target: directory where the files are located
entry = 'include %s\n' % new_default
defaults_file = '%s/defaults.cfg' % syslinux_target
new_default_with_path = "%s/%s" % (syslinux_target, new_default)
- new_grml_cfg = "%s/%s_grml.cfg" % ( syslinux_target, flavour_filename)
+ new_grml_cfg = "%s/%s_grml.cfg" % (syslinux_target, flavour_filename)
if os.path.isfile(defaults_file):