X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F26_support_dns_bootoption.patch;h=583e9b9275ae5d9cef27cb9ff169c9c363c509e2;hb=7782d4f2f03fdce733937edb1cf19c45ca112929;hp=ce1fc471abdaf80730bf7d37800379278f09aa47;hpb=7f62705bb65c0217c4b9af29420cc11e885c41f0;p=live-boot-grml.git

diff --git a/debian/patches/26_support_dns_bootoption.patch b/debian/patches/26_support_dns_bootoption.patch
index ce1fc47..583e9b9 100644
--- a/debian/patches/26_support_dns_bootoption.patch
+++ b/debian/patches/26_support_dns_bootoption.patch
@@ -5,30 +5,24 @@
 ## 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/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
  
-+			dns=*)
-+			  	DNSSERVER="${ARGUMENT#*=}"
-+				if echo "${DNSSERVER}" | grep -q , ; then
-+					DNSSERVER1="${DNSSERVER%,*}"
-+					DNSSERVER2="${DNSSERVER#*,}"
-+					export DNSSERVER1 DNSSERVER2
-+				else
-+					DNSSERVER1="$DNSSERVER"
-+					export DNSSERVER1
-+				fi
-+				unset DNSSERVER
-+				;;
- 			debug)
- 				DEBUG="Yes"
- 				export DEBUG
---- a/scripts/live-bottom/23networking_grml
-+++ b/scripts/live-bottom/23networking_grml
-@@ -44,7 +44,12 @@
+-			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/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"
@@ -42,11 +36,10 @@
  
  # config for loopback networking
  cat > $IFFILE << EOF
-@@ -105,3 +110,17 @@
- 
+@@ -90,4 +95,18 @@
      echo>> $IFFILE
  done
-+
+ 
 +# dns bootoption
 +if [ -n "$DNSSERVER1" ]
 +then
@@ -60,3 +53,27 @@
 +		echo "nameserver $i" >> $RESOLVCONF
 +	done
 +fi
++
+ }
+--- 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="${_PARAMETER#*=}"
++				if echo "${DNSSERVER}" | grep -q , ; then
++					DNSSERVER1="${DNSSERVER%,*}"
++					DNSSERVER2="${DNSSERVER#*,}"
++					export DNSSERVER1 DNSSERVER2
++				else
++					DNSSERVER1="$DNSSERVER"
++					export DNSSERVER1
++				fi
++				unset DNSSERVER
++				;;
++
+ 			bootid=*)
+ 				BOOTID="${_PARAMETER#bootid=}"
+ 				export BOOTID