dracut: fix fallback to default configuration file
authorDavid Dillow <dave@thedillows.org>
Sat, 23 May 2009 02:16:00 +0000 (22:16 -0400)
committerHarald Hoyer <harald@redhat.com>
Mon, 25 May 2009 09:51:57 +0000 (11:51 +0200)
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>
dracut

diff --git a/dracut b/dracut
index 7c98d04..be3c203 100755 (executable)
--- 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