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

Simplify dracut_install a bit, an make a minor fixup to check_module_deps

master
Victor Lowther 2009-08-15 07:55:59 -05:00
parent 161efa1f40
commit bd4c4bcb76
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
dracut-functions
View File

@ -203,32 +203,27 @@ inst_hook() {
} }


dracut_install() { dracut_install() {
local optional= if [[ $1 = '-o' ]]; then
local optional=yes
shift
fi
while (($# > 0)); do while (($# > 0)); do
# Might be nice to optionally install a binary if ! inst "$1" ; then
if [[ $1 = '-o' ]]; then if [[ $optional = yes ]]; then
optional=yes dwarning "Skipping program $1 as it cannot be found and is flagged to be optional"
shift else
continue derror "Failed to install $1"
fi exit 1
if inst "$1" ; then fi
shift fi
continue shift
fi
if [ "$optional" == "yes" ]; then
dwarning "Skipping program $1 as it cannot be found and is flagged to be optional"
shift
continue
else
derror "Failed to install $1"; exit 1
fi
done done
} }


check_module_deps() { check_module_deps() {
local moddir dep ret local moddir dep ret
# if we are already set to be loaded, we do not have to be checked again. # if we are already set to be loaded, we do not have to be checked again.
strstr "$mods_to_load" " $1 " strstr "$mods_to_load" " $1 " && return
# turn a module name into a directory, if we can. # turn a module name into a directory, if we can.
moddir=$(echo ${dsrc}/modules.d/??${1}) moddir=$(echo ${dsrc}/modules.d/??${1})
[[ -d $moddir && -x $moddir/install ]] || return 1 [[ -d $moddir && -x $moddir/install ]] || return 1