[PATCH 05/12] Fix behavior of resolveDevice when devspec is a device name.
David Lehman
dlehman at redhat.com
Thu Oct 4 22:10:09 UTC 2012
---
pyanaconda/storage/devicetree.py | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/pyanaconda/storage/devicetree.py b/pyanaconda/storage/devicetree.py
index f520c13..a5c6983 100644
--- a/pyanaconda/storage/devicetree.py
+++ b/pyanaconda/storage/devicetree.py
@@ -2202,18 +2202,22 @@ class DeviceTree(object):
break
else:
if not devspec.startswith("/dev/"):
- devspec = "/dev/" + devspec
+ device = self.getDeviceByName(devspec)
+ if not device:
+ devspec = "/dev/" + devspec
- if devspec.startswith("/dev/disk/"):
- devspec = os.path.realpath(devspec)
+ if not device:
+ if devspec.startswith("/dev/disk/"):
+ devspec = os.path.realpath(devspec)
if devspec.startswith("/dev/dm-"):
dm_name = devicelibs.dm.name_from_dm_node(devspec[5:])
if dm_name:
devspec = "/dev/mapper/" + dm_name
- # device path
- device = self.getDeviceByPath(devspec)
+ # device path
+ device = self.getDeviceByPath(devspec)
+
if device is None:
if blkidTab:
# try to use the blkid.tab to correlate the device
--
1.7.7.6
More information about the anaconda-patches
mailing list