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
cleanup-cruft
Chris Gianelloni 18 years ago
parent fa5253529a
commit 40ecfa2009

@ -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.

@ -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

Loading…
Cancel
Save