From: Ulrich Dangel <uli@spamt.net>
Date: Tue, 10 Nov 2009 09:56:10 +0000 (+0100)
Subject: Unset option.syslinux if grub option is set.
X-Git-Tag: v0.9.19~4
X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=commitdiff_plain;h=53db55285b887a61a8eec04b19c569a0836c2274

Unset option.syslinux if grub option is set.
---

diff --git a/grml2usb b/grml2usb
index 462baf4..ce22882 100755
--- a/grml2usb
+++ b/grml2usb
@@ -32,6 +32,11 @@ def syslinux_warning(option, opt, value, parser):
             "is grml2usb's default. Continuing anyway.\n")
     setattr(parser.values, option.dest, True)
 
+# if grub option is set, unset syslinux option
+def grub_option(option, opt, value, parser):
+    setattr(parser.values, option.dest, True)
+    setattr(parser.values, 'syslinux', False)
+
 # cmdline parsing
 USAGE = "Usage: %prog [options] <[ISO[s] | /live/image]> </dev/sdX#>\n\
 \n\
@@ -56,7 +61,8 @@ parser.add_option("--fat16", dest="fat16", action="store_true",
                   help="format specified partition with FAT16")
 parser.add_option("--force", dest="force", action="store_true",
                   help="force any actions requiring manual interaction")
-parser.add_option("--grub", dest="grub", action="store_true",
+parser.add_option("--grub", dest="grub", action="callback",
+                  callback=grub_option,
                   help="install grub bootloader instead of (default) syslinux")
 parser.add_option("--grub-mbr", dest="grubmbr", action="store_true",
                   help="install grub into MBR instead of (default) PBR")