If users disable IPv6 during installation, modify /etc/modprobe.conf on
the target system rather than creating /etc/modprobe.d/noipv6. Keeps
things consistent with the rest of the modprobe changes in anaconda on
rhel5-branch.
---
network.py | 7 +++----
packages.py | 1 -
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/network.py b/network.py
index d79abc7..227a19e 100644
--- a/network.py
+++ b/network.py
@@ -604,11 +604,10 @@ class Network:
f.close()
- # /etc/modprobe.d/noipv6
+ # /etc/modprobe.conf
if useIPv6 == "no":
- iutil.mkdirChain(instPath + "/etc/modprobe.d")
- f = open(instPath + "/etc/modprobe.d/noipv6", "w")
- f.write("# Disable IPv6 kernel modules (added by anaconda)\n")
+ iutil.mkdirChain(instPath + "/etc")
+ f = open(instPath + "/etc/modprobe.conf", "w")
f.write("alias net-pf-10 off\n")
f.write("alias ipv6 off\n")
f.write("options ipv6 disable=1\n")
diff --git a/packages.py b/packages.py
index c030eba..a1a6e56 100644
--- a/packages.py
+++ b/packages.py
@@ -209,7 +209,6 @@ def setFileCons(anaconda):
"/etc/blkid.tab", "/etc/blkid.tab.old",
"/etc/mtab", "/etc/fstab", "/etc/resolv.conf",
"/etc/modprobe.conf", "/etc/modprobe.conf~",
- "/etc/modprobe.d/noipv6",
"/var/log/wtmp", "/var/run/utmp",
"/dev/log", "/var/lib/rpm", "/", "/etc/raidtab",
"/etc/mdadm.conf", "/etc/hosts", "/etc/sysconfig/network",
--
1.7.3.2
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
