diff options
| -rw-r--r-- | pyanaconda/storage/__init__.py | 9 | ||||
| -rw-r--r-- | pyanaconda/storage/devicelibs/mpath.py | 7 | ||||
| -rw-r--r-- | pyanaconda/storage/devices.py | 1 |
3 files changed, 3 insertions, 14 deletions
diff --git a/pyanaconda/storage/__init__.py b/pyanaconda/storage/__init__.py index bdb3bfa04..679fcb260 100644 --- a/pyanaconda/storage/__init__.py +++ b/pyanaconda/storage/__init__.py @@ -2260,13 +2260,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/pyanaconda/storage/devicelibs/mpath.py b/pyanaconda/storage/devicelibs/mpath.py index efa95761a..c848a783d 100644 --- a/pyanaconda/storage/devicelibs/mpath.py +++ b/pyanaconda/storage/devicelibs/mpath.py @@ -265,10 +265,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/pyanaconda/storage/devices.py b/pyanaconda/storage/devices.py index a125652b0..7b90169c6 100644 --- a/pyanaconda/storage/devices.py +++ b/pyanaconda/storage/devices.py @@ -3247,7 +3247,6 @@ class MultipathDevice(DMDevice): self.config = { 'wwid' : self.identity, - 'alias' : self.name, 'mode' : '0600', 'uid' : '0', 'gid' : '0', |