SVN: rc-scripts/trunk/sysconfig/network-scripts/functions.network

[arekm]

Author: arekm
Date: Wed Mar 23 21:35:00 2011
New Revision: 12212

Modified:
   rc-scripts/trunk/sysconfig/network-scripts/functions.network
Log:
Disable IPv6 if it is not enabled in config.

Modified: rc-scripts/trunk/sysconfig/network-scripts/functions.network
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/functions.network	(original)
+++ rc-scripts/trunk/sysconfig/network-scripts/functions.network	Wed Mar 23 21:35:00 2011
@@ -370,8 +370,12 @@
 
 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