Let multipath tools handle this.
Resolves: rhbz#674241
Related: rhbz#640735
---
storage/__init__.py | 9 +++------
storage/devicelibs/mpath.py | 7 -------
storage/devices.py | 1 -
3 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/storage/__init__.py b/storage/__init__.py
index 90535b6..a7ff29b 100644
--- a/storage/__init__.py
+++ b/storage/__init__.py
@@ -2174,13 +2174,10 @@ class FSSet(object):
if multipath_conf:
multipath_path = os.path.normpath("%s/etc/multipath.conf" %
instPath)
- bindings_path = os.path.normpath("%s/etc/multipath/bindings" %
- instPath)
conf_contents = multipath_conf.write()
- bindings_contents = multipath_conf.write_bindings()
- open(multipath_path, "w").write(conf_contents)
- iutil.mkdirChain(os.path.dirname(bindings_path))
- open(bindings_path, "w").write(bindings_contents)
+ f = open(multipath_path, "w")
+ f.write(conf_contents)
+ f.close()
else:
log.info("not writing out mpath configuration")
diff --git a/storage/devicelibs/mpath.py b/storage/devicelibs/mpath.py
index 3f91cba..fb7e1aa 100644
--- a/storage/devicelibs/mpath.py
+++ b/storage/devicelibs/mpath.py
@@ -303,10 +303,3 @@ blacklist {
ret += '}\n'
return ret
-
- def write_bindings(self):
- ret = "# created by Anaconda\n"
- for mpath in self.mpaths:
- if ('alias' in mpath.config) and ('wwid' in mpath.config):
- ret += "%s %s\n" % (mpath.config['alias'], mpath.config['wwid'])
- return ret
diff --git a/storage/devices.py b/storage/devices.py
index 4eaa72c..a89de06 100644
--- a/storage/devices.py
+++ b/storage/devices.py
@@ -3255,7 +3255,6 @@ class MultipathDevice(DMDevice):
self.config = {
'wwid' : self.identity,
- 'alias' : self.name,
'mode' : '0600',
'uid' : '0',
'gid' : '0',
--
1.7.3.3
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
