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=0000000000000000000000000000000000000000;hb=26c670d1211c57b5b9c0317a7506f4f25765b238;hp=0da7f733199f794d9e8ec195cd6542f1672f43c9;hpb=14f658f90367f29d20e4fed7ad3a228994057e58;p=live-boot-grml.git

diff --git a/debian/patches/26_support_dns_bootoption.patch b/debian/patches/26_support_dns_bootoption.patch
deleted file mode 100644
index 0da7f73..0000000
--- a/debian/patches/26_support_dns_bootoption.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 26_support_dns_bootoption.dpatch by Michael Prokop <mika@grml.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support dns bootoption. Usage examples: dns=8.8.8.8 / dns=8.8.8.8,1.2.3.4
-
-@DPATCH@
-Index: live-boot-grml/components/9990-networking.sh
-===================================================================
---- live-boot-grml.orig/components/9990-networking.sh	2014-03-08 13:33:11.615385566 +0100
-+++ live-boot-grml/components/9990-networking.sh	2014-03-08 13:33:11.611386038 +0100
-@@ -151,7 +151,7 @@
- 				echo "search ${DNSDOMAIN}" >> /etc/resolv.conf
- 			fi
- 
--			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/components/9990-cmdline-old
-===================================================================
---- live-boot-grml.orig/components/9990-cmdline-old	2014-03-08 13:33:11.615385566 +0100
-+++ live-boot-grml/components/9990-cmdline-old	2014-03-08 13:33:11.611386038 +0100
-@@ -18,6 +18,19 @@
- 				BOOTIF="${_PARAMETER#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