X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F26_support_dns_bootoption.patch;h=2a5c862eda753ded889baa1320fe57ceb38d0812;hb=d621ee25ea648150e17ad626434a14ca26f0cbef;hp=f79d9622fb18227c5386f3e97d270d273c8f63db;hpb=8424e93b27a3c5ae551ff1a5c456d0de96fc67c8;p=live-boot-grml.git

diff --git a/debian/patches/26_support_dns_bootoption.patch b/debian/patches/26_support_dns_bootoption.patch
old mode 100755
new mode 100644
index f79d962..2a5c862
--- a/debian/patches/26_support_dns_bootoption.patch
+++ b/debian/patches/26_support_dns_bootoption.patch
@@ -5,31 +5,19 @@
 ## DP: Support dns bootoption. Usage examples: dns=8.8.8.8 / dns=8.8.8.8,1.2.3.4
 
 @DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' live-boot-grml~/scripts/live live-boot-grml/scripts/live
---- live-boot-grml~/scripts/live	2011-05-03 17:03:57.483541293 +0200
-+++ live-boot-grml/scripts/live	2011-05-03 17:03:57.576874626 +0200
-@@ -73,6 +73,18 @@
- 				export DEFCONSOLE
- 				;;
+--- a/scripts/live
++++ b/scripts/live
+@@ -429,7 +429,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
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' live-boot-grml~/scripts/live-bottom/23networking_grml live-boot-grml/scripts/live-bottom/23networking_grml
---- live-boot-grml~/scripts/live-bottom/23networking_grml	2011-05-03 17:03:57.426874629 +0200
-+++ live-boot-grml/scripts/live-bottom/23networking_grml	2011-05-03 17:05:11.820206602 +0200
+-			for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1}
++			for i in ${IPV4DNS0} ${IPV4DNS1} ${IPV4DNS1} ${DNSSERVER1} ${DNSSERVER2}
+ 			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 @@
  
  # prepare a new /etc/network/interfaces file (and, possibly, a new /etc/resolv.conf)
@@ -62,3 +50,25 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
 +		echo "nameserver $i" >> $RESOLVCONF
 +	done
 +fi
+--- a/scripts/live-helpers
++++ b/scripts/live-helpers
+@@ -59,6 +59,19 @@
+ 				BOOTIF="${x#BOOTIF=}"
+ 				;;
+ 
++			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