X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F41_drop_nameserver_from_ip_option.patch;fp=debian%2Fpatches%2F41_drop_nameserver_from_ip_option.patch;h=f43cfc4999bcad45df81b5ef968d1dc4fcc571a1;hb=a133107dd91bb77d92387c4b01b9cd4991c51a37;hp=0000000000000000000000000000000000000000;hpb=1aa780ac2a7a1b66d33ac1e142d84ff149b5edf0;p=live-boot-grml.git

diff --git a/debian/patches/41_drop_nameserver_from_ip_option.patch b/debian/patches/41_drop_nameserver_from_ip_option.patch
new file mode 100644
index 0000000..f43cfc4
--- /dev/null
+++ b/debian/patches/41_drop_nameserver_from_ip_option.patch
@@ -0,0 +1,41 @@
+Author: Michael Prokop <mika@grml.org>
+Date:   Mon Dec 17 16:31:42 CET 2012
+
+    Drop nameserver handling from ip= boot parameter.
+
+In commit ab6364da036b4b09c0e5c92b0e21c4d43e4bd4c2
+("Adding support for nameserver in ip= boot parameter.")
+Debian's live-boot added support for handling nameserver
+option inside the ip= boot parameter.
+
+This violates the ip= handling as documented in
+https://www.kernel.org/doc/Documentation/filesystems/nfs/nfsroot.txt
+
+--- a/scripts/boot/9990-netbase.sh
++++ b/scripts/boot/9990-netbase.sh
+@@ -44,7 +44,6 @@
+ 			ifaddress="$(echo ${ifline} | cut -f2 -d ':')"
+ 			ifnetmask="$(echo ${ifline} | cut -f3 -d ':')"
+ 			ifgateway="$(echo ${ifline} | cut -f4 -d ':')"
+-			nameserver="$(echo ${ifline} | cut -f5 -d ':')"
+ 
+ cat >> "${IFFILE}" << EOF
+ allow-hotplug ${ifname}
+@@ -62,17 +61,6 @@
+ EOF
+ 
+ 			fi
+-
+-			if [ -n "${nameserver}" ]
+-			then
+-				if [ -e "${DNSFILE}" ]
+-				then
+-					grep -v ^nameserver "${DNSFILE}" > "${DNSFILE}.tmp"
+-					mv "${DNSFILE}.tmp" "${DNSFILE}"
+-				fi
+-
+-				echo "nameserver ${nameserver}" >> "${DNSFILE}"
+-			fi
+ 		done
+ 	else
+ 		if [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ]