4 files changed, 10 insertions, 3 deletions
diff --git a/anaconda b/anaconda
index 502916546..d84403624 100755
--- a/anaconda
+++ b/anaconda
@@ -585,6 +585,8 @@ class Anaconda:
             f.write("cdrom\n")
         elif self._loaderMethodstr.startswith('hd:'):
             (partition, filesystem, dir) = string.split(self._loaderMethodstr[3:], ':')
+            if partition.startswith("/dev/"):
+                partition = partition[5:]
             f.write("harddrive --partition=%s --dir=%s\n" % (partition, dir))
         elif self._loaderMethodstr.startswith('nfs:') or self._loaderMethodstr.startswith('nfsiso:'):
             (method, server, dir) = string.split(self._loaderMethodstr, ':')
diff --git a/image.py b/image.py
index c2daa3625..021a0e6f2 100644
--- a/image.py
+++ b/image.py
@@ -141,9 +141,12 @@ def mountDirectory(isodir, methodstr, messageWindow):
     lines = f.readlines()
     f.close()
 
+    if not device.startswith("/dev/"):
+        device = "/dev/%s" %(device,)
+
     for l in lines:
         s = string.split(l)
-        if s[0] == "/dev/" + device:
+        if s[0] == device:
             # It is, so there's no need to try again.
             return
 
diff --git a/instdata.py b/instdata.py
index bf5300a04..3bc79fc9d 100644
--- a/instdata.py
+++ b/instdata.py
@@ -103,6 +103,8 @@ class InstallData:
         elif self.anaconda._loaderMethodstr.startswith("hd:"):
             method = self.anaconda._loaderMethodstr[3:]
             device = method.split(":", 3)[0]
+            if device.startswith("/dev/"):
+                device = device[5:]
             self.partitions.protected = [device]
 
     def setInstallProgressClass(self, c):
diff --git a/loader2/hdinstall.c b/loader2/hdinstall.c
index 2eab4bc0e..1a34b294c 100644
--- a/loader2/hdinstall.c
+++ b/loader2/hdinstall.c
@@ -202,7 +202,7 @@ static char * setupIsoImages(char * device, char * dirName, char * location) {
                         goto err;
                     } else {
                         rc = asprintf(&url, "hd:%s:%s:/%s",
-                                      strrchr(device, '/')+1,
+                                      device,
                                       *type, dirName ? dirName : ".");
                         return url;
                     }
@@ -230,7 +230,7 @@ static char * setupIsoImages(char * device, char * dirName, char * location) {
                 } else {
                     queryIsoMediaCheck(path);
                     free(path);
-                    rc = asprintf(&url, "hd:%s:%s:/%s", strrchr(device, '/')+1,
+                    rc = asprintf(&url, "hd:%s:%s:/%s", device,
                                   *type, dirName ? dirName : ".");
                     return url;
                 }