kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

dracut-functions.sh: fix inst_rule_programs() 

Logic for the $env{.*} check was reversed and env was missing.

Thanks Colin Guthrie!
master
Harald Hoyer 12 years ago
parent
c3dd68fcf1
commit
34bd2be23f
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      dracut-functions.sh

6
dracut-functions.sh
Unescape View File

@ -878,7 +878,7 @@ inst_rule_programs() {
_bin="" _bin=""
if [ -x ${udevdir}/$_prog ]; then if [ -x ${udevdir}/$_prog ]; then
_bin=${udevdir}/$_prog _bin=${udevdir}/$_prog
elif [[ "${_prog/\$\{/}" != "$_prog" ]]; then elif [[ "${_prog/\$env\{/}" == "$_prog" ]]; then
_bin=$(find_binary "$_prog") || { _bin=$(find_binary "$_prog") || {
dinfo "Skipping program $_prog using in udev rule ${1##*/} as it cannot be found" dinfo "Skipping program $_prog using in udev rule ${1##*/} as it cannot be found"
continue; continue;
@ -893,7 +893,7 @@ inst_rule_programs() {
_bin="" _bin=""
if [ -x ${udevdir}/$_prog ]; then if [ -x ${udevdir}/$_prog ]; then
_bin=${udevdir}/$_prog _bin=${udevdir}/$_prog
elif [[ "${_prog/\$\{/}" != "$_prog" ]]; then elif [[ "${_prog/\$env\{/}" == "$_prog" ]] && [[ "${_prog}" != "/sbin/initqueue" ]]; then
_bin=$(find_binary "$_prog") || { _bin=$(find_binary "$_prog") || {
dinfo "Skipping program $_prog using in udev rule ${1##*/} as it cannot be found" dinfo "Skipping program $_prog using in udev rule ${1##*/} as it cannot be found"
continue; continue;
@ -908,7 +908,7 @@ inst_rule_programs() {
_bin="" _bin=""
if [ -x ${udevdir}/$_prog ]; then if [ -x ${udevdir}/$_prog ]; then
_bin=${udevdir}/$_prog _bin=${udevdir}/$_prog
elif [[ "${_prog/\$\{/}" != "$_prog" ]]; then elif [[ "${_prog/\$env\{/}" == "$_prog" ]]; then
_bin=$(find_binary "$_prog") || { _bin=$(find_binary "$_prog") || {
dinfo "Skipping program $_prog using in udev rule ${1##*/} as it cannot be found" dinfo "Skipping program $_prog using in udev rule ${1##*/} as it cannot be found"
continue; continue;

Write Preview
Loading…
Cancel
Save