Allow +2 nameserver entries for dns= boot option

Closes: issue1234

diff --git a/components/9990-cmdline-old b/components/9990-cmdline-old
index 521170f..975ade2 100755 (executable)
--- a/components/9990-cmdline-old
+++ b/components/9990-cmdline-old
@@ -19,16 +19,10 @@ Cmdline_old ()
                                ;;
 
                        dns=*)
-                               DNSSERVER="${_PARAMETER#*=}"
-                               if echo "${DNSSERVER}" | grep -q , ; then
-                                       DNSSERVER1="${DNSSERVER%,*}"
-                                       DNSSERVER2="${DNSSERVER#*,}"
-                                       export DNSSERVER1 DNSSERVER2
-                               else
-                                       DNSSERVER1="$DNSSERVER"
-                                       export DNSSERVER1
-                               fi
-                               unset DNSSERVER
+                               DNS=${_PARAMETER#dns=}
+                               DNSSERVERS=$(echo ${DNS} | sed 's/,/ /g')
+                               export DNSSERVERS
+                               unset DNS
                                ;;
 
                        bootid=*)

diff --git a/components/9990-grml-networking.sh b/components/9990-grml-networking.sh
index 0d73e52..49ceb81 100644 (file)
--- a/components/9990-grml-networking.sh
+++ b/components/9990-grml-networking.sh
@@ -133,14 +133,14 @@ EOF
 done
 
 # dns bootoption
-if [ -n "$DNSSERVER1" ]
+if [ -n "$DNSSERVERS" ]
 then
        # disable any existing entries
        if [ -r $RESOLVCONF ]
        then
                sed -i 's/nameserver/# nameserver/' $RESOLVCONF
        fi
-       for i in $DNSSERVER1 $DNSSERVER2
+       for i in $DNSSERVERS
        do
                echo "nameserver $i" >> $RESOLVCONF
        done

diff --git a/components/9990-networking.sh b/components/9990-networking.sh
index 4337aa6..d5ed0fe 100755 (executable)
--- a/components/9990-networking.sh
+++ b/components/9990-networking.sh
@@ -161,7 +161,7 @@ do_netsetup ()
                                echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
                        fi
 
-                       for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1} ${DNSSERVER1} ${DNSSERVER2}
+                       for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1} ${DNSSERVERS}
                        do
                                if [ -n "$i" ] && [ "$i" != 0.0.0.0 ]
                                then