Updated changelog.

[grml2usb.git] / grml2usb

diff --git a/grml2usb b/grml2usb
index 24c81d1..6a21903 100755 (executable)
--- a/grml2usb
+++ b/grml2usb
@@ -17,6 +17,7 @@ from optparse import OptionParser
 from inspect import isroutine, isclass
 import datetime, logging, os, re, subprocess, sys, tempfile, time, os.path
 import fileinput
+import glob
 
 # global variables
 PROG_VERSION = "0.9.14"
@@ -1147,11 +1148,12 @@ def copy_bootloader_files(iso_mount, target):
                     'isoprompt.cfg', 'options.cfg', \
                     'prompt.cfg', 'vesamenu.c32', 'vesamenu.cfg', 'grml.png':
         path = search_file(filename, iso_mount + '/boot/isolinux/')
-        if not path:
-            print filename
-            continue
         exec_rsync(path, syslinux_target + filename)
 
+    # copy the addons_*.cfg file to the new syslinux directory
+    for filename in glob.glob(iso_mount + '/boot/isolinux/' + 'addon_*.cfg'):
+        exec_rsync(filename, syslinux_target)
+
     path = search_file('hidden.cfg', iso_mount + '/boot/isolinux/')
     exec_rsync(path, syslinux_target + "new_" + 'hidden.cfg')
 
@@ -1261,7 +1263,7 @@ def modify_grub_config(filename):
         for line in fileinput.input(filename, inplace=1):
             if regexe and option_re.search(line):
                 for regex in regexe:
-                    line = regex.sub(r'', line)
+                    line = regex.sub(' ', line)
 
             sys.stdout.write(line)
 
@@ -1457,7 +1459,7 @@ def adjust_syslinux_bootoptions(src, flavour):
         line = append_re.sub(r'\1 boot=live %s ' % bootopt, line)
         if option_re and option_re.search(line):
             for regex in regexe:
-                line = regex.sub('', line)
+                line = regex.sub(' ', line)
         sys.stdout.write(line)
     fileinput.close()