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 f007fccf8f9109607cddca6ae28956e579d53486..b4dd731301a89e5af446e12944d0aac0656eef95 100644 (file)
--- 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