summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--storage/devices.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/storage/devices.py b/storage/devices.py
index ca307bd36..8d7623b86 100644
--- a/storage/devices.py
+++ b/storage/devices.py
@@ -154,10 +154,18 @@ def deviceNameToDiskByPath(deviceName=None):
if not os.path.isdir(bypath):
return ""
+ deviceName = os.path.basename(deviceName)
+
for path in os.listdir(bypath):
- target = os.path.basename(os.readlink(bypath + '/' + path))
+ entry = bypath + '/' + path
+
+ if os.path.islink(entry):
+ target = os.path.basename(os.readlink(entry))
+ else:
+ target = os.path.basename(entry)
+
if target == deviceName:
- return path
+ return entry
return ""