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

[arekm]

Author: arekm
Date: Tue Mar  8 21:34:30 2011
New Revision: 12197

Modified:
   rc-scripts/trunk/sysconfig/network-scripts/functions.network
Log:
Load ipv6 and ipx only when not built into kernel.

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	Tue Mar  8 21:34:30 2011
@@ -346,12 +346,16 @@
 
 modprobe_net()
 {
-	if is_yes "$IPV6_NETWORKING" && is_module "ipv6"; then
-		_modprobe single ipv6
+	if is_yes "$IPV6_NETWORKING" && \
+		[ "$(awk '$1 ~ /^TCPv6/ { print $8 }' /proc/net/protocols 2> /dev/null)" != "kernel" ] && \
+		is_module "ipv6"; then
+			_modprobe single ipv6
 	fi
 
-	if is_yes "$IPX" && is_module "ipx"; then
-		_modprobe single ipx
+	if is_yes "$IPX" && \
+		[ "$(awk '$1 ~ /^IPX/ { print $8 }' /proc/net/protocols 2> /dev/null)" != "kernel" ] && \
+		is_module "ipx"; then
+			_modprobe single ipx
 	fi
 }