Related: rhbz#636570
---
storage/devicelibs/mpath.py | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/storage/devicelibs/mpath.py b/storage/devicelibs/mpath.py
index 944b5d6..ea4cfa7 100644
--- a/storage/devicelibs/mpath.py
+++ b/storage/devicelibs/mpath.py
@@ -3,6 +3,10 @@ import re
from ..udev import *
import iutil
+import logging
+import string
+
+log = logging.getLogger("storage")
def parseMultipathOutput(output):
# this function parses output from "multipath -d", so we can use its
@@ -60,7 +64,7 @@ def parseMultipathOutput(output):
pass
elif dmatch:
devices.append(dmatch.groups()[0].replace('!','/'))
-
+
if name and devices:
mpaths[name] = devices
@@ -77,12 +81,17 @@ def identifyMultipaths(devices):
# [sda, sdd], [[sdb, sdc]], [sr0, sda1, sdd1, sdd2]]
log.info("devices to scan for multipath: %s" % [d['name'] for d in devices])
+ with open("/etc/multipath.conf") as conf:
+ log.debug("/etc/multipath.conf contents:")
+ map(log.debug, map(string.rstrip, conf))
+ log.debug("(end of /etc/multipath.conf)")
+
topology = parseMultipathOutput(iutil.execWithCapture("multipath", ["-d",]))
# find the devices that aren't in topology, and add them into it...
topodevs = reduce(lambda x,y: x.union(y), topology.values(), set())
for name in set([d['name'] for d in devices]).difference(topodevs):
topology[name] = [name]
-
+
devmap = {}
non_disk_devices = {}
for d in devices:
--
1.7.3.2
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
