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

dracut-functions.sh: check if dinfo is a function 

If "dinfo" is an executable, dracut-logger.sh would never be sourced.

See: https://bugzilla.redhat.com/show_bug.cgi?id=1167082
master
Harald Hoyer 2014-11-24 15:17:45 +01:00
parent e1e4ee9d7c
commit 26d14fb3d3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dracut-functions.sh
View File

@ -176,7 +176,13 @@ srcmods="/lib/modules/$kernel/"
} }
export srcmods export srcmods


if ! type dinfo >/dev/null 2>&1; then # is_func <command>
# Check whether $1 is a function.
is_func() {
[[ "$(type -t "$1")" = "function" ]]
}

if ! is_func dinfo >/dev/null 2>&1; then
. "$dracutbasedir/dracut-logger.sh" . "$dracutbasedir/dracut-logger.sh"
dlog_init dlog_init
fi fi
@ -209,12 +215,6 @@ mksubdirs() {
[[ -e ${1%/*} ]] || mkdir -m 0755 -p -- "${1%/*}" [[ -e ${1%/*} ]] || mkdir -m 0755 -p -- "${1%/*}"
} }


# is_func <command>
# Check whether $1 is a function.
is_func() {
[[ "$(type -t "$1")" = "function" ]]
}

# Function prints global variables in format name=value line by line. # Function prints global variables in format name=value line by line.
# $@ = list of global variables' name # $@ = list of global variables' name
print_vars() { print_vars() {