From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Tue, 8 Mar 2011 20:34:30 +0000 (+0000)
Subject: Load ipv6 and ipx only when not built into kernel.
X-Git-Tag: 0.4.4.0~5
X-Git-Url: http://git.pld-linux.org/?p=projects%2Frc-scripts.git;a=commitdiff_plain;h=405b91ff424df7c3e7c0fc25ea65728ee65f02a3

Load ipv6 and ipx only when not built into kernel.

svn-id: @12197
---

diff --git a/sysconfig/network-scripts/functions.network b/sysconfig/network-scripts/functions.network
index 86b72f04..15183517 100644
--- a/sysconfig/network-scripts/functions.network
+++ b/sysconfig/network-scripts/functions.network
@@ -346,12 +346,16 @@ set_down_loopback()
 
 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
 }