From: Harald Hoyer <harald@redhat.com>
Date: Thu, 19 Mar 2015 11:33:03 +0000 (+0100)
Subject: base/dracut-lib.sh: read /proc/cmdline with multiple lines
X-Git-Tag: RHEL-7.2~84
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34b49be88219519f678f665987787784751b11bd;p=thirdparty%2Fdracut.git

base/dracut-lib.sh: read /proc/cmdline with multiple lines

also parse cmdline files without an ending newline

(cherry picked from commit 9f0878540bdc8054dc2b45427eed957b9bd25f2d)
---

diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index 69f707991..3ffbb0217 100755
--- a/modules.d/99base/dracut-lib.sh
+++ b/modules.d/99base/dracut-lib.sh
@@ -115,6 +115,7 @@ getcmdline() {
     local _i
     local CMDLINE_ETC_D
     local CMDLINE_ETC
+    local CMDLINE_PROC
     unset _line
 
     if [ -e /etc/cmdline ]; then
@@ -124,13 +125,15 @@ getcmdline() {
     fi
     for _i in /etc/cmdline.d/*.conf; do
         [ -e "$_i" ] || continue
-        while read -r _line; do
+        while read -r _line || [ -n "$_line" ]; do
             CMDLINE_ETC_D="$CMDLINE_ETC_D $_line";
         done <"$_i";
     done
     if [ -e /proc/cmdline ]; then
-        read -r CMDLINE </proc/cmdline;
-        CMDLINE="$CMDLINE_ETC_D $CMDLINE_ETC $CMDLINE"
+        while read -r _line || [ -n "$_line" ]; do
+            CMDLINE_PROC="$CMDLINE_PROC $_line"
+        done </proc/cmdline;
+        CMDLINE="$CMDLINE_ETC_D $CMDLINE_ETC $CMDLINE_PROC"
     fi
     printf "%s" "$CMDLINE"
 }