[PATCH 1/3] getDeviceByName does not expect the CD device to start with "/dev/" (#491768).

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



---
 anaconda |    3 +++
 image.py |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/anaconda b/anaconda
index 28893e2..7779703 100755
--- a/anaconda
+++ b/anaconda
@@ -571,6 +571,9 @@ class Anaconda:
             if not tree.startswith("/"):
                 tree = "/%s" %(tree,)
 
+            if device.startswith("/dev/"):
+                device = device[5:]
+
             self.mediaDevice = device
             self.methodstr = "cdrom://%s" % tree
         else:
diff --git a/image.py b/image.py
index dea1e40..c77d923 100644
--- a/image.py
+++ b/image.py
@@ -264,7 +264,7 @@ def scanForMedia(tree, storage):
             isys.umount(tree)
             continue
 
-        return dev.path
+        return dev.name
 
     return None
 
-- 
1.6.1.3

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux