X-Git-Url: http://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=6f9eec9cb69e204a7e42876f20a830dbb2cc50a9;hp=361e6a08107edc256d6f08edcbb4c03f7dd78c11;hb=6ba9f5e7e886583ece72a5eb13ab48af1a6e8b22;hpb=3877a01364b2ba0b74fcdb9b9b5ed712a7ac29f7

diff --git a/grml2usb b/grml2usb
index 361e6a0..6f9eec9 100755
--- a/grml2usb
+++ b/grml2usb
@@ -20,7 +20,7 @@ import fileinput
 import glob
 
 # global variables
-PROG_VERSION = "0.9.17-pre1"
+PROG_VERSION = "0.9.18"
 MOUNTED = set()  # register mountpoints
 TMPFILES = set() # register tmpfiles
 DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg
@@ -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]