* network.py (Network.write): Do not write out a disable-ipv6 file

        in /etc/modprobe.d if the user has disabled IPv6 during
        install (#237642).
        * packages.py (setFileCons): Remove /etc/modprobe.d from the
        list (#237642).

1 files changed, 0 insertions, 16 deletions

diff --git a/network.py b/network.py
index 523a311bb..a91dadd97 100644
--- a/network.py
+++ b/network.py
@@ -429,7 +429,6 @@ class Network:
         if not os.path.isdir("%s/etc/sysconfig/network-scripts" %(instPath,)):
             iutil.mkdirChain("%s/etc/sysconfig/network-scripts" %(instPath,))
 
-        useIPv6 = False
         # /etc/sysconfig/network-scripts/ifcfg-*
         for dev in self.netdevices.values():
             device = dev.get("device")
@@ -440,9 +439,6 @@ class Network:
             if len(dev.get("DESC")) > 0:
                 f.write("# %s\n" % (dev.get("DESC"),))
 
-            if dev.get("USEIPV6"):
-               useIPv6 = True
-
             f.write(str(dev))
 
             # write out the hostname as DHCP_HOSTNAME if given (#81613)
@@ -479,18 +475,6 @@ class Network:
             f.write("GATEWAY=%s\n" % (self.gateway,))
         f.close()
 
-        # /etc/modprobe.d/disable-ipv6
-        mpdir = "%s/etc/modprobe.d" % (instPath,)
-        blacklist = "%s/disable-ipv6" % (mpdir,)
-        if not useIPv6 and not os.path.isfile(blacklist):
-            if not os.path.isdir(mpdir):
-                os.makedirs(mpdir, 0755)
-
-            f = open(blacklist, "w")
-            os.chmod(blacklist, 0644)
-            f.write("install ipv6 /bin/true\n")
-            f.close()
-
         # /etc/hosts
         f = open(instPath + "/etc/hosts", "w")
         localline = ""