Harald Hoyer e09d6b
From eab9b75c8a9b106d2f35faae0af51ab1c66e8da1 Mon Sep 17 00:00:00 2001
Harald Hoyer e09d6b
From: Harald Hoyer <harald@redhat.com>
Harald Hoyer e09d6b
Date: Tue, 22 Jul 2014 14:43:33 +0200
Harald Hoyer e09d6b
Subject: [PATCH] dracut.sh: add DRACUT_PATH
Harald Hoyer e09d6b
Harald Hoyer e09d6b
DRACUT_PATH can now be used to specify the PATH used by dracut
Harald Hoyer e09d6b
to search for binaries instead of the default
Harald Hoyer e09d6b
/usr/sbin:/sbin:/usr/bin:/bin
Harald Hoyer e09d6b
Harald Hoyer e09d6b
This should be set in the distribution config file
Harald Hoyer e09d6b
/usr/lib/dracut/dracut.conf.d/01-dist.conf
Harald Hoyer e09d6b
---
Harald Hoyer e09d6b
 dracut.sh | 25 ++++++++++++++-----------
Harald Hoyer e09d6b
 1 file changed, 14 insertions(+), 11 deletions(-)
Harald Hoyer e09d6b
Harald Hoyer e09d6b
diff --git a/dracut.sh b/dracut.sh
Harald Hoyer e09d6b
index 3e1bf44..1844336 100755
Harald Hoyer e09d6b
--- a/dracut.sh
Harald Hoyer e09d6b
+++ b/dracut.sh
Harald Hoyer e09d6b
@@ -626,21 +626,10 @@ if ! [[ $outfile ]]; then
Harald Hoyer e09d6b
     fi
Harald Hoyer e09d6b
 fi
Harald Hoyer e09d6b
 
Harald Hoyer e09d6b
-for i in /usr/sbin /sbin /usr/bin /bin; do
Harald Hoyer e09d6b
-    rl=$i
Harald Hoyer e09d6b
-    if [ -L "$i" ]; then
Harald Hoyer e09d6b
-        rl=$(readlink -f $i)
Harald Hoyer e09d6b
-    fi
Harald Hoyer e09d6b
-    if [[ "$NPATH" != *:$rl* ]] ; then
Harald Hoyer e09d6b
-        NPATH+=":$rl"
Harald Hoyer e09d6b
-    fi
Harald Hoyer e09d6b
-done
Harald Hoyer e09d6b
-export PATH="${NPATH#:}"
Harald Hoyer e09d6b
 unset LC_MESSAGES
Harald Hoyer e09d6b
 unset LC_CTYPE
Harald Hoyer e09d6b
 export LC_ALL=C
Harald Hoyer e09d6b
 export LANG=C
Harald Hoyer e09d6b
-unset NPATH
Harald Hoyer e09d6b
 unset LD_LIBRARY_PATH
Harald Hoyer e09d6b
 unset LD_PRELOAD
Harald Hoyer e09d6b
 unset GREP_OPTIONS
Harald Hoyer e09d6b
@@ -685,6 +674,20 @@ for f in $(dropindirs_sort ".conf" "$confdir" "$dracutbasedir/dracut.conf.d"); d
Harald Hoyer e09d6b
     [[ -e $f ]] && . "$f"
Harald Hoyer e09d6b
 done
Harald Hoyer e09d6b
 
Harald Hoyer e09d6b
+DRACUT_PATH=${DRACUT_PATH:-/usr/sbin /sbin /usr/bin /bin}
Harald Hoyer e09d6b
+
Harald Hoyer e09d6b
+for i in $DRACUT_PATH; do
Harald Hoyer e09d6b
+    rl=$i
Harald Hoyer e09d6b
+    if [ -L "$i" ]; then
Harald Hoyer e09d6b
+        rl=$(readlink -f $i)
Harald Hoyer e09d6b
+    fi
Harald Hoyer e09d6b
+    if [[ "$NPATH" != *:$rl* ]] ; then
Harald Hoyer e09d6b
+        NPATH+=":$rl"
Harald Hoyer e09d6b
+    fi
Harald Hoyer e09d6b
+done
Harald Hoyer e09d6b
+export PATH="${NPATH#:}"
Harald Hoyer e09d6b
+unset NPATH
Harald Hoyer e09d6b
+
Harald Hoyer e09d6b
 # these optins add to the stuff in the config file
Harald Hoyer e09d6b
 if (( ${#add_dracutmodules_l[@]} )); then
Harald Hoyer e09d6b
     while pop add_dracutmodules_l val; do