X-Git-Url: https://git.grml.org/?p=grml2usb.git;a=blobdiff_plain;f=grml2usb;h=63c26b37598958f301eed341a6efe1412626b52c;hp=075029e5bb2a631e3f49ab7463414f9e2f1bbc48;hb=5251ce1484272c48247551148a59dbd6bb13f6f1;hpb=f3a85acbbab6bd1f0140bdf8e7496d983a8a7c15

diff --git a/grml2usb b/grml2usb
index 075029e..63c26b3 100755
--- a/grml2usb
+++ b/grml2usb
@@ -108,6 +108,8 @@ parser.add_option("--syslinux", dest="syslinux", action="callback", default=True
                   help="install syslinux bootloader (deprecated as it's the default)")
 parser.add_option("--syslinux-mbr", dest="syslinuxmbr", action="store_true",
                   help="install syslinux master boot record (MBR) instead of default")
+parser.add_option("--tmpdir", dest="tmpdir", default="/tmp",
+                  help="directory to be used for temporary files")
 parser.add_option("--verbose", dest="verbose", action="store_true",
                   help="enable verbose mode")
 parser.add_option("-v", "--version", dest="version", action="store_true",
@@ -1107,7 +1109,8 @@ def identify_grml_flavour(mountpath):
 
     if not version_files:
         logging.critical("Error: could not find grml-version file.")
-        raise
+        cleanup()
+        sys.exit(1)
 
     flavours = []
     logging.debug("version_files = %s", version_files)
@@ -1429,7 +1432,7 @@ def install(image, device):
         logging.info("Using %s as install base", image)
     else:
         logging.info("Using ISO %s", image)
-        iso_mountpoint = tempfile.mkdtemp(prefix="grml2usb")
+        iso_mountpoint = tempfile.mkdtemp(prefix="grml2usb", dir=options.tmpdir)
         register_tmpfile(iso_mountpoint)
         remove_image_mountpoint = True
         try:
@@ -1457,7 +1460,7 @@ def install_grml(mountpoint, device):
 
     device_mountpoint = device
     if os.path.isdir(device):
-        logging.info("Specified device is not a directory, therefore not mounting.")
+        logging.info("Specified device is a directory, therefore not mounting.")
         remove_device_mountpoint = False
     else:
         device_mountpoint = tempfile.mkdtemp(prefix="grml2usb")