From: Sergey Fionov <fionov@gmail.com>
Date: Sat, 1 Aug 2009 07:52:16 +0000 (+0400)
Subject: Fix full pathname condition in find_library
X-Git-Tag: 0.8~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c296f15b1f87fa0e5078556bae73d3ee6788b00;p=thirdparty%2Fdracut.git

Fix full pathname condition in find_library

Hello,

Now a fact that the path is full is checked by
[[ -x $1 ]]

But if the working directory is /bin or a directory with a file named
"mount",
this condition will be met for "inst mount", and "mount" will not be copied
into initrd at all.
---

diff --git a/dracut-functions b/dracut-functions
index d4caacfe8..0af93e23f 100755
--- a/dracut-functions
+++ b/dracut-functions
@@ -83,7 +83,7 @@ inst_library() {
 # search in the usual places to find the binary.
 find_binary() {
     local binpath="/bin /sbin /usr/bin /usr/sbin" p
-    [[ -x $1 ]] && { echo $1; return 0; }
+    [[ -z ${1##/*} && -x $1 ]] && { echo $1; return 0; } 
     for p in $binpath; do
 	[[ -x $p/$1 ]] && { echo "$p/$1"; return 0; }
     done