From: David Dillow <dave@thedillows.org>
Date: Sat, 23 May 2009 02:16:00 +0000 (-0400)
Subject: dracut: fix fallback to default configuration file
X-Git-Tag: 0.1~204
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6722a717ea499c55e5a8493ff3be14de40f9bdab;p=thirdparty%2Fdracut.git

dracut: fix fallback to default configuration file

Need to do the fallback in a list rather than a subshell, or we never
actually set $conffile.

Signed-off-by: David Dillow <dave@thedillows.org>
---

diff --git a/dracut b/dracut
index 7c98d0428..be3c20332 100755
--- a/dracut
+++ b/dracut
@@ -62,7 +62,7 @@ while (($# > 0)); do
     shift
 done
 
-[[ -f $conffile ]] || ( [[ -f /etc/dracut.conf ]] && conffile="/etc/dracut.conf" )
+[[ -f $conffile ]] || { [[ -f /etc/dracut.conf ]] && conffile="/etc/dracut.conf" }
 [[ -f $conffile ]] && . "$conffile"
 [[ $dracutmodules_l ]] && dracutmodules=$dracutmodules_l
 [[ $omit_dracutmodules_l ]] && omit_dracutmodules=$omit_dracutmodules_l