diff options
| -rw-r--r-- | image.py | 10 | ||||
| -rw-r--r-- | iw/task_gui.py | 8 | ||||
| -rw-r--r-- | yuminstall.py | 6 |
3 files changed, 19 insertions, 5 deletions
@@ -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:] diff --git a/iw/task_gui.py b/iw/task_gui.py index f1133f5ff..cfac62ab4 100644 --- a/iw/task_gui.py +++ b/iw/task_gui.py @@ -183,7 +183,13 @@ class RepoEditor: elif self.anaconda.methodstr.startswith("cdrom:"): pass elif self.anaconda.methodstr.startswith("hd:"): - (device, fstype, path) = self.anaconda.methodstr[3:].split(":", 3) + m = self.anaconda.methodstr[3:] + if m.count(":") == 1: + (device, path) = m.split(":") + fstype = "auto" + else: + (device, fstype, path) = m.split(":") + # find device in self.partitionComboBox and select it self.directoryChooser.set_current_folder(path) else: diff --git a/yuminstall.py b/yuminstall.py index 8e4f2a484..09311bf6a 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -528,7 +528,11 @@ class AnacondaYum(YumSorter): m = self.anaconda.methodstr if m.startswith("hd:"): - (device, fstype, path) = m[3:].split(":", 3) + if m.count(":") == 2: + (device, path) = m[3:].split(":") + else: + (device, fstype, path) = m[3:].split(":") + self.isodir = "/mnt/isodir/%s" % path # This takes care of mounting /mnt/isodir first. |