X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F26_support_dns_bootoption.patch;h=aad51f1418b3c32cd6f766f9f1e92b61ca53328b;hb=7d773fad4a9f232eea97a5968519fee1f626d25d;hp=2a5c862eda753ded889baa1320fe57ceb38d0812;hpb=76af4813596007fc5e4db649f9dd9b498058e2e2;p=live-boot-grml.git

diff --git a/debian/patches/26_support_dns_bootoption.patch b/debian/patches/26_support_dns_bootoption.patch
index 2a5c862..aad51f1 100644
--- a/debian/patches/26_support_dns_bootoption.patch
+++ b/debian/patches/26_support_dns_bootoption.patch
@@ -5,9 +5,11 @@
 ## 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	2013-08-15 08:01:43.007980354 +0200
++++ live-boot-grml/scripts/boot/9990-networking.sh	2013-08-15 08:01:43.007980354 +0200
+@@ -152,7 +152,7 @@
  				echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
  			fi
  
@@ -16,9 +18,11 @@
  			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	2013-08-15 08:01:43.007980354 +0200
++++ live-boot-grml/scripts/boot/9990-grml-networking.sh	2013-08-15 08:01:43.007980354 +0200
+@@ -28,7 +28,12 @@
  
  # prepare a new /etc/network/interfaces file (and, possibly, a new /etc/resolv.conf)
  IFFILE="/root/etc/network/interfaces"
@@ -32,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
@@ -50,14 +53,18 @@
 +		echo "nameserver $i" >> $RESOLVCONF
 +	done
 +fi
---- a/scripts/live-helpers
-+++ b/scripts/live-helpers
-@@ -59,6 +59,19 @@
- 				BOOTIF="${x#BOOTIF=}"
++
+ }
+Index: live-boot-grml/scripts/boot/9990-cmdline-old
+===================================================================
+--- live-boot-grml.orig/scripts/boot/9990-cmdline-old	2013-08-15 08:01:43.007980354 +0200
++++ live-boot-grml/scripts/boot/9990-cmdline-old	2013-08-15 08:01:43.007980354 +0200
+@@ -18,6 +18,19 @@
+ 				BOOTIF="${_PARAMETER#BOOTIF=}"
  				;;
  
 +			dns=*)
-+			  	DNSSERVER="${ARGUMENT#*=}"
++			  	DNSSERVER="${_PARAMETER#*=}"
 +				if echo "${DNSSERVER}" | grep -q , ; then
 +					DNSSERVER1="${DNSSERVER%,*}"
 +					DNSSERVER2="${DNSSERVER#*,}"
@@ -69,6 +76,6 @@
 +				unset DNSSERVER
 +				;;
 +
- 			debug)
- 				DEBUG="Yes"
- 				export DEBUG
+ 			bootid=*)
+ 				BOOTID="${_PARAMETER#bootid=}"
+ 				export BOOTID