## DP: Support dns bootoption. Usage examples: dns=8.8.8.8 / dns=8.8.8.8,1.2.3.4
@DPATCH@
---- a/scripts/live
-+++ b/scripts/live
-@@ -77,6 +77,18 @@
- BOOTIF="${x#BOOTIF=}"
+Index: live-boot-grml/components/9990-networking.sh
+===================================================================
+--- live-boot-grml.orig/components/9990-networking.sh 2014-03-08 13:33:11.615385566 +0100
++++ live-boot-grml/components/9990-networking.sh 2014-03-08 13:33:11.611386038 +0100
+@@ -151,7 +151,7 @@
+ echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
+ fi
+
+- for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1}
++ for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1} ${DNSSERVER1} ${DNSSERVER2}
+ do
+ if [ -n "$i" ] && [ "$i" != 0.0.0.0 ]
+ then
+Index: live-boot-grml/components/9990-cmdline-old
+===================================================================
+--- live-boot-grml.orig/components/9990-cmdline-old 2014-03-08 13:33:11.615385566 +0100
++++ live-boot-grml/components/9990-cmdline-old 2014-03-08 13:33:11.611386038 +0100
+@@ -18,6 +18,19 @@
+ BOOTIF="${_PARAMETER#BOOTIF=}"
;;
+ dns=*)
-+ DNSSERVER="${ARGUMENT#*=}"
++ DNSSERVER="${_PARAMETER#*=}"
+ if echo "${DNSSERVER}" | grep -q , ; then
+ DNSSERVER1="${DNSSERVER%,*}"
+ DNSSERVER2="${DNSSERVER#*,}"
+ fi
+ unset DNSSERVER
+ ;;
- debug)
- DEBUG="Yes"
- export DEBUG
---- a/scripts/live-bottom/23networking_grml
-+++ b/scripts/live-bottom/23networking_grml
-@@ -44,7 +44,12 @@
-
- # prepare a new /etc/network/interfaces file (and, possibly, a new /etc/resolv.conf)
- IFFILE="/root/etc/network/interfaces"
--RESOLVCONF="/root/etc/resolv.conf"
-+if [ -L /root/etc/resolv.conf ] ; then
-+ # assume we have resolvconf
-+ RESOLVCONF=/root/etc/resolvconf/resolv.conf.d/base
-+else
-+ RESOLVCONF="/root/etc/resolv.conf"
-+fi
-
- # config for loopback networking
- cat > $IFFILE << EOF
-@@ -105,3 +110,17 @@
-
- echo>> $IFFILE
- done
+
-+# dns bootoption
-+if [ -n "$DNSSERVER1" ]
-+then
-+ # disable any existing entries
-+ if [ -r $RESOLVCONF ]
-+ then
-+ sed -i 's/nameserver/# nameserver/' $RESOLVCONF
-+ fi
-+ for i in $DNSSERVER1 $DNSSERVER2
-+ do
-+ echo "nameserver $i" >> $RESOLVCONF
-+ done
-+fi
+ bootid=*)
+ BOOTID="${_PARAMETER#bootid=}"
+ export BOOTID