X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=66c40c38fcc9dda0d0e0c56164f5478f75463868;hp=8ffe71ff22e763243661fa2de50820ee9f62b02c;hb=d10b71b7c6dda652f3a00ecd9ace6c5710e94543;hpb=9ad819c6cc0031bf348066972e08fbd1391be8e0

diff --git a/grml2usb b/grml2usb
index 8ffe71f..66c40c3 100755
--- a/grml2usb
+++ b/grml2usb
@@ -1371,11 +1371,18 @@ def adjust_syslinux_bootoptions(src_name, dst_name, flavour):
     src = open(src_name, "r")
     dst = open(dst_name, "w")
 
+    # do NOT write "None" in kernel cmdline
+    if options.bootoptions is None:
+        bootopt = ""
+    else:
+        bootopt = options.bootoptions
+
     for line in src:
         line = boot_re.sub(r'/boot/release/%s/\2 ' % flavour, line)
         line = flavour_re.sub(r'\1 %s-\2' % flavour, line)
         line = default_re.sub(r'%s-\1' % flavour, line)
         line = append_re.sub(r'\1 live-media-path=/live/%s/ ' % flavour, line)
+        line = append_re.sub(r'\1 boot=live %s ' % bootopt, line)
         dst.write(line)
     src.close()
     dst.close()