From: Harald Hoyer <harald@redhat.com>
Date: Fri, 15 Jan 2010 11:33:41 +0000 (+0100)
Subject: dracut-lib: read multiple lines from $init/etc/cmdline
X-Git-Tag: 004~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2dfdcbf4e7ffbd2354fa37888c4d9640a48d9272;p=thirdparty%2Fdracut.git

dracut-lib: read multiple lines from $init/etc/cmdline
---

diff --git a/dracut.8 b/dracut.8
index 869c99970..563d0d1b2 100644
--- a/dracut.8
+++ b/dracut.8
@@ -369,6 +369,9 @@ debug network scripts in dracut. Output is written to /tmp/
 Any files found in /conf/conf.d/ will be sourced in the initramfs to 
 set initial values. Command line options will override these values 
 set in the configuration files.
+.TP
+.B /etc/cmdline
+Can contain additional command line options.
 
 .SH FILES
 .TP
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index faf3c0ae8..42db21a4c 100644
--- a/modules.d/99base/dracut-lib.sh
+++ b/modules.d/99base/dracut-lib.sh
@@ -2,7 +2,11 @@ getarg() {
     set +x
     local o line
     if [ -z "$CMDLINE" ]; then
-	[ -e /etc/cmdline ] && read CMDLINE_ETC </etc/cmdline;
+        if [ -e /etc/cmdline ]; then
+            while read line; do
+                CMDLINE_ETC="$CMDLINE_ETC $line";
+            done </etc/cmdline;
+        fi
 	read CMDLINE </proc/cmdline;
 	CMDLINE="$CMDLINE $CMDLINE_ETC"
     fi
@@ -32,7 +36,11 @@ getargs() {
     set +x
     local o line found
     if [ -z "$CMDLINE" ]; then
-	[ -e /etc/cmdline ] && read CMDLINE_ETC </etc/cmdline;
+	if [ -e /etc/cmdline ]; then
+            while read line; do
+                CMDLINE_ETC="$CMDLINE_ETC $line";
+            done </etc/cmdline;
+        fi
 	read CMDLINE </proc/cmdline;
 	CMDLINE="$CMDLINE $CMDLINE_ETC"
     fi