kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor fixups to kernel module loading 

Also rewrite filter_kernel_modules to make it a little easier to read.
master
Victor Lowther 2009-08-20 22:21:33 -05:00
parent 240cc7c480
commit fb8923f681
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dracut-functions
View File

@ -327,7 +327,8 @@ check_modules() {
install_kmod_with_fw() { install_kmod_with_fw() {
local modname=${1##*/} fwdir found local modname=${1##*/} fwdir found
modname=${modname%.ko} modname=${modname%.ko}
inst_simple "$1" "/lib/modules/$kernel/${1##*/lib/modules/$kernel/}" inst_simple "$1" "/lib/modules/$kernel/${1##*/lib/modules/$kernel/}" || \
return 0 # no need to go further if the module is already installed
for fw in $(modinfo -k $kernel -F firmware $1 2>/dev/null); do for fw in $(modinfo -k $kernel -F firmware $1 2>/dev/null); do
found='' found=''
for fwdir in $fw_dir; do for fwdir in $fw_dir; do
@ -365,18 +366,16 @@ for_each_kmod_dep() {
# The behaviour of this function can vary depending on whether $hostonly is set. # The behaviour of this function can vary depending on whether $hostonly is set.
# If it is, we will only look at modules that are already in memory. # If it is, we will only look at modules that are already in memory.
# If it is not, we will look at all kernel modules # If it is not, we will look at all kernel modules
# This function returns the full filenames of modules that match # This function returns the full filenames of modules that match $1
filter_kernel_modules () ( filter_kernel_modules () (
if [[ $hostonly = '' ]]; then if [[ $hostonly = '' ]]; then
for modname in $(find "$srcmods/kernel/drivers" -name '*.ko'); do filtercmd='find "$srcmods/kernel/drivers" -name "*.ko"'
"$1" "$modname" && echo "$modname"
done
else else
while read modname rest; do filtercmd='cut -d " " -f 1 </proc/modules|xargs modinfo -F filename -k $kernel'
modname=$(modinfo -F filename -k $kernel $modname)
"$1" "$modname" && echo "$modname"
done </proc/modules
fi fi
for modname in $(eval $filtercmd); do
"$1" "$modname" && echo "$modname"
done
) )


# install kernel modules along with all their dependencies. # install kernel modules along with all their dependencies.
@ -384,7 +383,8 @@ instmods() {
[[ $no_kernel = yes ]] && return [[ $no_kernel = yes ]] && return
local mod mpargs modpath modname cmd local mod mpargs modpath modname cmd
while (($# > 0)); do while (($# > 0)); do
mod=${1%.ko} mod=${1##*/}
mod=${mod%.ko}
case $mod in case $mod in
=*) # This introduces 2 incompatible meanings for =* arguments =*) # This introduces 2 incompatible meanings for =* arguments
# to instmods. We need to decide which one to keep. # to instmods. We need to decide which one to keep.
@ -401,8 +401,7 @@ instmods() {
# Must never run this diagnostic-only module # Must never run this diagnostic-only module
shift; continue; shift; continue;
;; ;;
*) mod=${mod##*/} *) # if we are already installed, skip this module and go on
# if we are already installed, skip this module and go on
# to the next one. # to the next one.
[[ -f $initdir/$1 ]] && { shift; continue; } [[ -f $initdir/$1 ]] && { shift; continue; }
# If we are building a host-specific initramfs and this # If we are building a host-specific initramfs and this