1 files changed, 7 insertions, 3 deletions
diff --git a/image.py b/image.py
index 4c3708b6e..f942fe182 100644
--- a/image.py
+++ b/image.py
@@ -128,10 +128,14 @@ def getMediaId(path):
 def mountDirectory(methodstr, messageWindow):
     if methodstr.startswith("hd:"):
         method = methodstr[3:]
-        (device, fstype, path) = method.split(":", 3)
-        device = method[0:method.index(":")]
+        if method.count(":") == 1:
+            (device, path) = method.split(":")
+            fstype = "auto"
+        else:
+            (device, fstype, path) = method.split(":")
 
-        if not device.startswith("/dev/"):
+        if not device.startswith("/dev/") and not device.startswith("UUID=") \
+           and not device.startswith("LABEL="):
             device = "/dev/%s" % device
     elif methodstr.startswith("nfsiso:"):
         device = methodstr[7:]