From: Amadeusz Żołnowski <aidecoe@aidecoe.name>
Date: Sun, 7 Oct 2012 13:29:03 +0000 (+0200)
Subject: dracut-functions.sh: find_binary: path starting with variable
X-Git-Tag: 024~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e0d508002c549ff4cd133d137c8b09ff8935705;p=thirdparty%2Fdracut.git

dracut-functions.sh: find_binary: path starting with variable

Credits go to Alexander Tsoy <bugs+gentoo@puleglot.ru> who provided the
patch with following explanation:

  I get messages "Skipping program $env{DM_SBIN_PATH}/..." when
  generating initramfs. This happens because some udev rules contains
  variables in path to command:

  $ egrep -r 'IMPORT\{program\}=\"\$' /lib64/udev/rules.d/
  /lib64/udev/rules.d/10-dm.rules:ENV{DM_COOKIE}=="?*", IMPORT{program}="$env{DM_SBIN_PATH}/dmsetup udevflags $env{DM_COOKIE}"

  [...]

  $ sudo dracut -f "" 3.5.4-hardened-r1
  I: *** Including module: dm ***
  I: Skipping program $env{DM_SBIN_PATH}/dmsetup using in udev rule 10-dm.rules as it cannot be found
---

diff --git a/dracut-functions.sh b/dracut-functions.sh
index 8f59ff457..58b0b4dcc 100755
--- a/dracut-functions.sh
+++ b/dracut-functions.sh
@@ -45,7 +45,7 @@ find_binary() {
         fi
     fi
 
-    type -P $1
+    type -P ${1##*/}
 }
 
 if ! [[ $dracutbasedir ]]; then