From: Harald Hoyer <harald@redhat.com>
Date: Fri, 24 Jul 2009 11:42:10 +0000 (+0200)
Subject: dracut-lib: getarg(), getargs() read command line also from /etc/cmdline
X-Git-Tag: 0.7~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c1a37d928f4a22375857f3752bec80a81f7dab31;p=thirdparty%2Fdracut.git

dracut-lib: getarg(), getargs() read command line also from /etc/cmdline

Also honor parameters in /etc/cmdline.

getarg(): If the argument is first fround in /proc/cmdline, then it is
used
---

diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index f007fccf8..b4dd73130 100644
--- a/modules.d/99base/dracut-lib.sh
+++ b/modules.d/99base/dracut-lib.sh
@@ -1,6 +1,10 @@
 getarg() {
     local o line
-    [ "$CMDLINE" ] || read CMDLINE </proc/cmdline;
+    if [ -z "$CMDLINE" ]; then
+	read CMDLINE_ETC </etc/cmdline;
+	read CMDLINE </proc/cmdline;
+	CMDLINE="$CMDLINE $CMDLINE_ETC"
+    fi
     for o in $CMDLINE; do
 	[ "$o" = "$1" ] && return 0
 	[ "${o%%=*}" = "${1%=}" ] && { echo ${o#*=}; return 0; }
@@ -10,7 +14,11 @@ getarg() {
 
 getargs() {
     local o line found
-    [ "$CMDLINE" ] || read CMDLINE </proc/cmdline;
+    if [ -z "$CMDLINE" ]; then
+	read CMDLINE_ETC </etc/cmdline;
+	read CMDLINE </proc/cmdline;
+	CMDLINE="$CMDLINE $CMDLINE_ETC"
+    fi
     for o in $CMDLINE; do
 	[ "$o" = "$1" ] && return 0
 	if [ "${o%%=*}" = "${1%=}" ]; then