Disable IPv6 if it is not enabled in config.

svn-id: @12212

diff --git a/sysconfig/network-scripts/functions.network b/sysconfig/network-scripts/functions.network
index 92684cd487e2451fe2a860e450607fe72cc3de7f..85d6f777c1cee86c9f528ac014e9aa5ea53a4de6 100644 (file)
--- a/sysconfig/network-scripts/functions.network
+++ b/sysconfig/network-scripts/functions.network
@@ -370,8 +370,12 @@ set_down_loopback()
 
 modprobe_net()
 {
-       if is_yes "$IPV6_NETWORKING" && is_module "ipv6"; then
-               _modprobe single ipv6
+       if is_yes "$IPV6_NETWORKING"
+               if is_module "ipv6"; then
+                       _modprobe single ipv6
+               fi
+       elif [ -d /proc/sys/net/ipv6 ]; then
+               sysctl -w net.ipv6.conf.all.disable_ipv6=0
        fi
 
        if is_yes "$IPX" && is_module "ipx"; then