Added a fix for similarly-named modules from bug #158017.

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/genkernel/trunk@469 67a159dc-881f-0410-a524-ba9dfbe2cb84

diff --git a/ChangeLog b/ChangeLog
index 40e724a7a6da3cb789bf380efe729f9eb350e531..a9b492ac0a3857e4e1d87996c57f8c56cc968d5e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 2006-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> generic/modprobe:
+  Added a fix for similarly-named modules from bug #158017.
+
   13 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org> gen_compile.sh:
   Fixed up linking for dmraid for bug #157538.
 

diff --git a/generic/modprobe b/generic/modprobe
index 90cac83603a3515774b6036d6aaa8ea343d67b46..25eba6a51b8986498d01213e70aba8308132371c 100755 (executable)
--- a/generic/modprobe
+++ b/generic/modprobe
@@ -2,8 +2,7 @@
 
 . /etc/initrd.defaults
 
-usage()
-{
+usage() {
        echo 'Usage:'
        echo '  modprobe moduleprefix'
        echo
@@ -15,8 +14,7 @@ usage()
 }
 
 # Pass module name to this function
-modules_dep_list()
-{
+modules_dep_list() {
        if [ "$#" -lt '1' ]
        then
                echo 'modules_dep_list(): Improper usage!'
@@ -27,8 +25,7 @@ modules_dep_list()
 
 
 # Pass module deps list
-strip_mod_paths()
-{
+strip_mod_paths() {
        local x
        local ret
        local myret
@@ -44,8 +41,7 @@ strip_mod_paths()
 }
 
 LOADED_MODULES=''
-is_module_already_loaded()
-{
+is_module_already_loaded() {
        local x
        if [ "$#" != '1' ]
        then
@@ -63,14 +59,12 @@ is_module_already_loaded()
        return 1
 }
 
-real_mod_path()
-{
+real_mod_path() {
        # Find -name is no good since the return status is always zero
-       find /lib/modules | grep "${1}${KSUFF}"
+       find /lib/modules | grep /"${1}${KSUFF}"
 }
 
-modprobe2()
-{
+modprobe2() {
        local x
        local deps
        local real_path