X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F26_support_dns_bootoption.patch;h=0da7f733199f794d9e8ec195cd6542f1672f43c9;hb=fdf285d157bf1558728e0b6b6bea3b4f78a7b108;hp=aad51f1418b3c32cd6f766f9f1e92b61ca53328b;hpb=a6e250845a22f7b54e2936a64e98430ed3c79194;p=live-boot-grml.git

diff --git a/debian/patches/26_support_dns_bootoption.patch b/debian/patches/26_support_dns_bootoption.patch
index aad51f1..0da7f73 100644
--- a/debian/patches/26_support_dns_bootoption.patch
+++ b/debian/patches/26_support_dns_bootoption.patch
@@ -5,11 +5,11 @@
 ## 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/scripts/boot/9990-networking.sh
+Index: live-boot-grml/components/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 @@
+--- 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
  
@@ -18,47 +18,10 @@ Index: live-boot-grml/scripts/boot/9990-networking.sh
  			do
  				if [ -n "$i" ] && [ "$i" != 0.0.0.0 ]
  				then
-Index: live-boot-grml/scripts/boot/9990-grml-networking.sh
+Index: live-boot-grml/components/9990-cmdline-old
 ===================================================================
---- 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"
--RESOLVCONF="/root/etc/resolv.conf"
-+if [ -L /root/etc/resolv.conf ] ; then
-+  # assume we have resolvconf
-+  RESOLVCONF=/root/etc/resolvconf/resolv.conf.d/base
-+else
-+  RESOLVCONF="/root/etc/resolv.conf"
-+fi
- 
- # config for loopback networking
- cat > $IFFILE << EOF
-@@ -90,4 +95,18 @@
-     echo>> $IFFILE
- done
- 
-+# dns bootoption
-+if [ -n "$DNSSERVER1" ]
-+then
-+	# disable any existing entries
-+	if [ -r $RESOLVCONF ]
-+	then
-+		sed -i 's/nameserver/# nameserver/' $RESOLVCONF
-+	fi
-+	for i in $DNSSERVER1 $DNSSERVER2
-+	do
-+		echo "nameserver $i" >> $RESOLVCONF
-+	done
-+fi
-+
- }
-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
+--- 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=}"
  				;;