From: Harald Hoyer <harald@redhat.com>
Date: Mon, 24 Nov 2014 14:17:45 +0000 (+0100)
Subject: dracut-functions.sh: check if dinfo is a function
X-Git-Tag: 041~87
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26d14fb3d36d6091f64258a62c49939478405693;p=thirdparty%2Fdracut.git

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

diff --git a/dracut-functions.sh b/dracut-functions.sh
index b43b76647..17a71f0eb 100755
--- a/dracut-functions.sh
+++ b/dracut-functions.sh
@@ -176,7 +176,13 @@ srcmods="/lib/modules/$kernel/"
 }
 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"
     dlog_init
 fi
@@ -209,12 +215,6 @@ mksubdirs() {
     [[ -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.
 # $@ = list of global variables' name
 print_vars() {