X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=06c3c9cb0a03ec9f63d1a9669fe56b2406ef1218;hp=3e9475e06214d3b05d19037ba1aef7ef6aca4e09;hb=851503fa7a9d1f48e0dbbdd8956126364034d5a0;hpb=afcc7b22dfdecb49ca05ac4cb8758cd98889ef4f

diff --git a/grml2usb b/grml2usb
index 3e9475e..06c3c9c 100755
--- a/grml2usb
+++ b/grml2usb
@@ -439,7 +439,7 @@ background  = FFCC33
 
 # define entries:
 title %(grml_flavour)s  - Default boot (using 1024x768 framebuffer)
-kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off vga=791 quiet boot=live nomce live-media-path=/live/%(grml_flavour)s/
+kernel (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/linux26 apm=power-off vga=791 quiet boot=live nomce live-media-path=/live/%(grml_flavour)s/ %(bootoptions)s
 initrd (hd0,%(install_partition)s)/boot/release/%(grml_flavour)s/initrd.gz
 
 title Memory test (memtest86+)
@@ -1562,6 +1562,9 @@ def handle_compat_warning(device):
 def handle_logging():
     """Log handling and configuration"""
 
+    if options.verbose and options.quiet:
+        parser.error("please use either verbose (--verbose) or quiet (--quiet) option")
+
     if options.verbose:
         FORMAT = "Debug: %(asctime)-15s %(message)s"
         logging.basicConfig(level=logging.DEBUG, format=FORMAT)