From: Michael Prokop <mika@grml.org>
Date: Fri, 26 Jun 2015 13:05:54 +0000 (+0200)
Subject: Drop nameserver handling from ip= boot parameter.
X-Git-Tag: debian/5.0_a4-1+grml.1~8
X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=commitdiff_plain;h=c9f691f2a162911d90595f904b16c4e9a7f23fc5

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
---

diff --git a/components/9990-netbase.sh b/components/9990-netbase.sh
index a32a47b..6fb7988 100755
--- a/components/9990-netbase.sh
+++ b/components/9990-netbase.sh
@@ -49,7 +49,6 @@ EOF
 			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}
@@ -67,17 +66,6 @@ cat >> "${IFFILE}" << EOF
 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}" ]