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

[arekm]

Author: arekm
Date: Tue Mar  8 21:49:06 2011
New Revision: 12198

Modified:
   rc-scripts/trunk/rc.d/init.d/functions
   rc-scripts/trunk/sysconfig/network-scripts/functions.network
Log:
Revert previous commit. Fix is_module instead to do not match partial module names.

Modified: rc-scripts/trunk/rc.d/init.d/functions
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/functions	(original)
+++ rc-scripts/trunk/rc.d/init.d/functions	Tue Mar  8 21:49:06 2011
@@ -939,7 +939,7 @@
 is_module() {
 	# module name without .o at end
 	if ! lsmod | grep -q "$1"; then
-		if ls -R /lib/modules/$(uname -r)/ 2> /dev/null | grep -q "${1}.\(\|k\)o\(\|.gz\)"; then
+		if ls -1R /lib/modules/$(uname -r)/ 2> /dev/null | grep -q "^${1}.\(\|k\)o\(\|.gz\)"; then
 			# true
 			return 0
 		fi

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