From: Ulrich Dangel <uli@spamt.net>
Date: Wed, 4 Nov 2009 10:06:57 +0000 (+0100)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: v0.9.18~2
X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=commitdiff_plain;h=52eae2e4196e4e79eba9ad24c80765d4e5e120df;hp=f460ee6e041c8e9f523f5e1298265e26b7629b22

Merge remote branch 'origin/master'
---

diff --git a/grml2usb b/grml2usb
index a09b97f..05d3b38 100755
--- a/grml2usb
+++ b/grml2usb
@@ -1220,6 +1220,8 @@ def install_iso_files(grml_flavour, iso_mount, device, target):
     # * catch "install: .. No space left on device" & CO
 
     if options.dryrun:
+        global GRML_DEFAULT
+        GRML_DEFAULT = grml_flavour
         return 0
     elif not options.bootloaderonly:
         logging.info("Copying files. This might take a while....")
@@ -1892,6 +1894,10 @@ def main():
     if options.dryrun:
         logging.info("Running in simulation mode as requested via option dry-run.")
 
+    if options.grubmbr and not options.grub:
+        logging.critical("Error: --grub-mbr requires --grub option.")
+        sys.exit(1)
+
     # specified arguments
     device = args[len(args) - 1]
     isos = args[0:len(args) - 1]