X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F26_support_dns_bootoption.patch;fp=debian%2Fpatches%2F26_support_dns_bootoption.patch;h=2a5c862eda753ded889baa1320fe57ceb38d0812;hb=91460b9cb497f74c444cf57ef237311124c1eb90;hp=6c32e06ede6ca78e7d485ce830ccadb2588895b1;hpb=39679793d147502b2d9a329bffff320e20e8165e;p=live-boot-grml.git

diff --git a/debian/patches/26_support_dns_bootoption.patch b/debian/patches/26_support_dns_bootoption.patch
index 6c32e06..2a5c862 100644
--- a/debian/patches/26_support_dns_bootoption.patch
+++ b/debian/patches/26_support_dns_bootoption.patch
@@ -7,26 +7,7 @@
 @DPATCH@
 --- a/scripts/live
 +++ b/scripts/live
-@@ -77,6 +77,18 @@
- 				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
-@@ -846,7 +858,7 @@
+@@ -429,7 +429,7 @@
  				echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
  			fi
  
@@ -69,3 +50,25 @@
 +		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