From 34bd2be23f61d44c4d163ef3d23d3374e0607c0f Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 7 Mar 2013 14:27:49 +0100 Subject: [PATCH] dracut-functions.sh: fix inst_rule_programs() Logic for the $env{.*} check was reversed and env was missing. Thanks Colin Guthrie! --- dracut-functions.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dracut-functions.sh b/dracut-functions.sh index 59a8c63..53ee9f7 100755 --- a/dracut-functions.sh +++ b/dracut-functions.sh @@ -878,7 +878,7 @@ inst_rule_programs() { _bin="" if [ -x ${udevdir}/$_prog ]; then _bin=${udevdir}/$_prog - elif [[ "${_prog/\$\{/}" != "$_prog" ]]; then + elif [[ "${_prog/\$env\{/}" == "$_prog" ]]; then _bin=$(find_binary "$_prog") || { dinfo "Skipping program $_prog using in udev rule ${1##*/} as it cannot be found" continue; @@ -893,7 +893,7 @@ inst_rule_programs() { _bin="" if [ -x ${udevdir}/$_prog ]; then _bin=${udevdir}/$_prog - elif [[ "${_prog/\$\{/}" != "$_prog" ]]; then + elif [[ "${_prog/\$env\{/}" == "$_prog" ]] && [[ "${_prog}" != "/sbin/initqueue" ]]; then _bin=$(find_binary "$_prog") || { dinfo "Skipping program $_prog using in udev rule ${1##*/} as it cannot be found" continue; @@ -908,7 +908,7 @@ inst_rule_programs() { _bin="" if [ -x ${udevdir}/$_prog ]; then _bin=${udevdir}/$_prog - elif [[ "${_prog/\$\{/}" != "$_prog" ]]; then + elif [[ "${_prog/\$env\{/}" == "$_prog" ]]; then _bin=$(find_binary "$_prog") || { dinfo "Skipping program $_prog using in udev rule ${1##*/} as it cannot be found" continue; -- 2.7.4