removed all direct references to /proc/cmdline

use getarg() and getargs() from /lib/dracut-lib.sh instead of
reinventing the wheel

diff --git a/modules.d/40network/ifup b/modules.d/40network/ifup
index 045085596657e891f8217ccf2882d88e8fb56135..37b78cd7e8bd8ea4f6d00f05197f7e1fcabb329c 100755 (executable)
--- a/modules.d/40network/ifup
+++ b/modules.d/40network/ifup
@@ -100,10 +100,8 @@ ip=$(getarg ip)
 
 # Specific configuration, spin through the kernel command line
 # looking for ip= lines
-[ "$CMDLINE" ] || read CMDLINE </proc/cmdline;
-for p in $CMDLINE; do
-    [ -n "${p%ip=*}" ] && continue
-    ip_to_var ${p#ip=}
+for p in $(getargs ip=); do
+    ip_to_var $p
        
     # If this option isn't directed at our interface, skip it
     [ -n "$dev" ] && [ "$dev" != "$netif" ] && continue

diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh
index 7e1ea6bffad79c19e05db00b39c85faaf18c6383..8db9fb5fc4ad1ec1f0eaed981b8887276c286c5d 100755 (executable)
--- a/modules.d/40network/parse-ip-opts.sh
+++ b/modules.d/40network/parse-ip-opts.sh
@@ -52,10 +52,9 @@ fi
 
 # Count ip= lines to decide whether we need bootdev= or not
 if [ -z "$NEEDBOOTDEV" ] ; then
-    [ "$CMDLINE" ] || read CMDLINE < /proc/cmdline
     local count=0
-    for p in $CMDLINE; do
-       [ "${p%%=*}" = "ip" ] && count=$(( $count + 1 ))
+    for p in $(getargs ip=); do
+       count=$(( $count + 1 ))
     done
     [ $count -gt 1 ] && NEEDBOOTDEV=1
 fi
@@ -68,11 +67,8 @@ fi
 
 # Check ip= lines
 # XXX Would be nice if we could errorcheck ip addresses here as well
-[ "$CMDLINE" ] || read CMDLINE < /proc/cmdline
-for p in $CMDLINE; do
-    [ -n "${p%ip=*}" ] && continue
-
-    ip_to_var ${p#ip=}
+for p in $(getargs ip=); do
+    ip_to_var $p
 
     # We need to have an ip= line for the specified bootdev
     [ -n "$NEEDBOOTDEV" ] && [ "$dev" = "$BOOTDEV" ] && BOOTDEVOK=1
@@ -85,28 +81,28 @@ for p in $CMDLINE; do
 
     # Error checking for autoconf in combination with other values
     case $autoconf in
-       error) die "Error parsing option '$p'";;
+       error) die "Error parsing option 'ip=$p'";;
        bootp|rarp|both) die "Sorry, ip=$autoconf is currenty unsupported";;
        none|off) \
            [ -z "$ip" ] && \
-               die "For argument '$p'\nValue '$autoconf' without static configuration does not make sense"
+               die "For argument 'ip=$p'\nValue '$autoconf' without static configuration does not make sense"
            [ -z "$mask" ] && \
                die "Sorry, automatic calculation of netmask is not yet supported"
            ;;
        dhcp|on|any) \
            [ -n "$NEEDBOOTDEV" ] && [ -z "$dev" ] && \
-               die "Sorry, '$p' does not make sense for multiple interface configurations"
+               die "Sorry, 'ip=$p' does not make sense for multiple interface configurations"
            [ -n "$ip" ] && \
-               die "For argument '$p'\nSorry, setting client-ip does not make sense for '$autoconf'"
+               die "For argument 'ip=$p'\nSorry, setting client-ip does not make sense for '$autoconf'"
            ;;
-       *) die "For argument '$p'\nSorry, unknown value '$autoconf'";;
+       *) die "For argument 'ip=$p'\nSorry, unknown value '$autoconf'";;
     esac
 
     if [ -n "$dev" ] ; then
         # We don't like duplicate device configs
        if [ -n "$IFACES" ] ; then
            for i in $IFACES ; do
-               [ "$dev" = "$i" ] && die "For argument '$p'\nDuplication configurations for '$dev'"
+               [ "$dev" = "$i" ] && die "For argument 'ip=$p'\nDuplication configurations for '$dev'"
            done
        fi
        # IFACES list for later use

diff --git a/modules.d/99base/parse-blacklist.sh b/modules.d/99base/parse-blacklist.sh
index 9c0a9e09d2decde074de70672782d1c2a67fbf71..7020b317ad5f671275354c5e952daf250cb7e75c 100755 (executable)
--- a/modules.d/99base/parse-blacklist.sh
+++ b/modules.d/99base/parse-blacklist.sh
@@ -1,10 +1,5 @@
 #!/bin/sh
 
-if getarg rdblacklist= >/dev/null ; then
-    [ "$CMDLINE" ] || read CMDLINE < /proc/cmdline
-    for p in $CMDLINE; do
-        [ -n "${p%rdblacklist=*}" ] && continue
-
-        echo "blacklist ${p#rdblacklist=}" >> /etc/modprobe.d/initramfsblacklist.conf
-    done
-fi
+for p in $(getargs rdblacklist=); do 
+     echo "blacklist $p" >> /etc/modprobe.d/initramfsblacklist.conf
+done