[master 1/1] network: don't set NM_CONTROLLED=no for root on SAN.

rvykydal installerbot-noreply at redhat.com
Thu Oct 8 14:49:26 UTC 2015


From: Radek Vykydal <rvykydal at redhat.com>

NM now takes over connections created in initramfs seamlessly, and our ifcfg is
overwritten by dracut anyway.
---
 pyanaconda/network.py | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/pyanaconda/network.py b/pyanaconda/network.py
index d6cd63e..d330262 100644
--- a/pyanaconda/network.py
+++ b/pyanaconda/network.py
@@ -1060,22 +1060,6 @@ def disableIPV6(rootpath):
             f.write("net.ipv6.conf.all.disable_ipv6=1\n")
             f.write("net.ipv6.conf.default.disable_ipv6=1\n")
 
-def disableNMForStorageDevices(rootpath, storage):
-    for devname in nm.nm_devices():
-        if (usedByFCoE(devname, storage) or
-            usedByRootOnISCSI(devname, storage)):
-            ifcfg_path = find_ifcfg_file_of_device(devname, root_path=rootpath)
-            if not ifcfg_path:
-                log.warning("disableNMForStorageDevices: ifcfg file for %s not found",
-                            devname)
-                continue
-            ifcfg = IfcfgFile(ifcfg_path)
-            ifcfg.read()
-            ifcfg.set(('NM_CONTROLLED', 'no'))
-            ifcfg.write()
-            log.info("network device %s used by storage will not be "
-                     "controlled by NM", devname)
-
 # sets ONBOOT=yes (and its mirror value in ksdata) for devices used by FCoE
 def autostartFCoEDevices(rootpath, storage, ksdata):
     for devname in nm.nm_devices():
@@ -1102,19 +1086,6 @@ def usedByFCoE(iface, storage):
             return True
     return False
 
-def usedByRootOnISCSI(iface, storage):
-    rootdev = storage.rootDevice
-    for d in storage.devices:
-        if (isinstance(d, iScsiDiskDevice) and
-            rootdev.dependsOn(d)):
-            if d.nic == "default" or ":" in d.nic:
-                if iface == ifaceForHostIP(d.host_address):
-                    return True
-            elif d.nic == iface:
-                return True
-
-    return False
-
 def write_sysconfig_network(rootpath, overwrite=False):
 
     cfgfile = os.path.normpath(rootpath + networkConfFile)
@@ -1134,8 +1105,6 @@ def write_network_config(storage, ksdata, instClass, rootpath):
     copyDhclientConfFiles(rootpath)
     copyFileToPath("/etc/resolv.conf", rootpath, overwrite=flags.livecdInstall)
     instClass.setNetworkOnbootDefault(ksdata)
-    # NM_CONTROLLED is not mirrored in ksdata
-    disableNMForStorageDevices(rootpath, storage)
     autostartFCoEDevices(rootpath, storage, ksdata)
 
 def update_hostname_data(ksdata, hostname):


-- 
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/5e0f8b804a27950360b56a300ae99a6568a65daf


More information about the anaconda-patches mailing list