Revert previous commit. Fix is_module instead to do not match partial module names.

svn-id: @12198

diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index e25549c5fe487cfaa02cdf7aec4728e6c5d98844..15f867a9cff853ad0174ed7f7651568707ee5e26 100644 (file)
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -939,7 +939,7 @@ confirm() {
 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

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