aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Nykryn <lnykryn@redhat.com>2012-02-14 09:34:00 +0100
committerLukas Nykryn <lnykryn@redhat.com>2012-02-14 09:34:00 +0100
commit42e18f922f9f2e15be9051d829e5e3903b3371b9 (patch)
treeab6d0fc909e21931859a1f126d1a60a9b001c5fb
parente9159d185c4ef709333d9e530e9edbb8695997e0 (diff)
parent9ad8d723aca4372cfe74d67fe4a9e63ce251a8b2 (diff)
downloadinitscripts-42e18f922f9f2e15be9051d829e5e3903b3371b9.tar
initscripts-42e18f922f9f2e15be9051d829e5e3903b3371b9.tar.gz
initscripts-42e18f922f9f2e15be9051d829e5e3903b3371b9.tar.bz2
initscripts-42e18f922f9f2e15be9051d829e5e3903b3371b9.tar.xz
initscripts-42e18f922f9f2e15be9051d829e5e3903b3371b9.zip
Merge branch 'master' of ssh://git.fedorahosted.org/git/initscripts
-rw-r--r--sysconfig.txt9
1 files changed, 3 insertions, 6 deletions
diff --git a/sysconfig.txt b/sysconfig.txt
index 20b5b89f..280ea4dd 100644
--- a/sysconfig.txt
+++ b/sysconfig.txt
@@ -290,12 +290,9 @@ Generic options:
NETWORKING_IPV6=yes|no
Enable or disable global IPv6 initialization
- To do this properly, add a rule in /etc/modprobe.d that disables IPv6.
- Note that the ipv6 module may be required by some other modules, for
- example bonding, even when IPv6 is not in use so it is not recommended
- to prevent loading it. Instead, use for example this in
- /etc/modprobe.d/disable-ipv6.conf:
- options ipv6 disable=1
+ To do this properly, disable IPv6 in the module itself.
+
+ This can be done by booting the kernel with "ipv6.disable_ipv6=1".
/etc/sysconfig/static-routes-ipv6:
Contains lines of the form: