From: Harald Hoyer <harald@redhat.com>
Date: Wed, 21 Jan 2015 08:32:20 +0000 (+0100)
Subject: dracut.sh: handle empty $initrd/etc/cmdline.d
X-Git-Tag: 041~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=496e3d962dc247ad56159cea6cbc3fe7a1d1131f;p=thirdparty%2Fdracut.git

dracut.sh: handle empty $initrd/etc/cmdline.d
---

diff --git a/dracut.sh b/dracut.sh
index 07e49658f..df016b691 100755
--- a/dracut.sh
+++ b/dracut.sh
@@ -1622,12 +1622,16 @@ if ! ( echo $PARMS_TO_STORE > $initdir/lib/dracut/build-parameter.txt ); then
 fi
 
 if [[ $hostonly_cmdline ]] ; then
+    unset _stored_cmdline
     if [ -d $initdir/etc/cmdline.d ];then
         dinfo "Stored kernel commandline:"
         for conf in $initdir/etc/cmdline.d/*.conf ; do
+            [ -e "$conf" ] || continue
             dinfo "$(< $conf)"
+            _stored_cmdline=1
         done
-    else
+    fi
+    if ! [[ $_stored_cmdline ]]; then
         dinfo "No dracut internal kernel commandline stored in initrd"
     fi
 fi