## 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
-@@ -429,7 +429,7 @@
+Index: live-boot-grml/scripts/boot/9990-networking.sh
+===================================================================
+--- live-boot-grml.orig/scripts/boot/9990-networking.sh 2012-11-28 17:23:14.954502427 +0100
++++ live-boot-grml/scripts/boot/9990-networking.sh 2012-11-28 17:46:56.190917365 +0100
+@@ -153,7 +153,7 @@
echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
fi
do
if [ -n "$i" ] && [ "$i" != 0.0.0.0 ]
then
---- a/scripts/live-bottom/23networking_grml
-+++ b/scripts/live-bottom/23networking_grml
-@@ -44,7 +44,12 @@
+Index: live-boot-grml/scripts/boot/9990-grml-networking.sh
+===================================================================
+--- live-boot-grml.orig/scripts/boot/9990-grml-networking.sh 2012-11-28 17:46:38.000000000 +0100
++++ live-boot-grml/scripts/boot/9990-grml-networking.sh 2012-11-28 17:46:56.190917365 +0100
+@@ -28,7 +28,12 @@
# prepare a new /etc/network/interfaces file (and, possibly, a new /etc/resolv.conf)
IFFILE="/root/etc/network/interfaces"
# config for loopback networking
cat > $IFFILE << EOF
-@@ -105,3 +110,17 @@
-
+@@ -90,4 +95,18 @@
echo>> $IFFILE
done
-+
+
+# dns bootoption
+if [ -n "$DNSSERVER1" ]
+then
+ echo "nameserver $i" >> $RESOLVCONF
+ done
+fi
---- a/scripts/live-helpers
-+++ b/scripts/live-helpers
-@@ -59,6 +59,19 @@
++
+ }
+--- live-boot-grml.orig/scripts/boot/9990-cmdline-old 2012-11-28 17:46:38.000000000 +0100
++++ live-boot-grml/scripts/boot/9990-cmdline-old 2012-11-28 17:46:56.190917365 +0100
+@@ -18,6 +18,19 @@
BOOTIF="${x#BOOTIF=}"
;;
+ dns=*)
-+ DNSSERVER="${ARGUMENT#*=}"
++ DNSSERVER="${_PARAMETER#*=}"
+ if echo "${DNSSERVER}" | grep -q , ; then
+ DNSSERVER1="${DNSSERVER%,*}"
+ DNSSERVER2="${DNSSERVER#*,}"
+ unset DNSSERVER
+ ;;
+
- debug)
- DEBUG="Yes"
- export DEBUG
+ bootid=*)
+ BOOTID="${_PARAMETER#bootid=}"
+ export BOOTID