X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-netbase.sh;h=df8d08051917f26d59617f74c634641d2f44909a;hb=1a226f4c74bf1952ed77394ab9e9805055d0ed35;hp=a32a47bfea45af60053271f8700f34936b735965;hpb=e071847bc4f3b01f1f0f96deea4a6da2d059ef27;p=live-boot-grml.git

diff --git a/components/9990-netbase.sh b/components/9990-netbase.sh
index a32a47b..df8d080 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}" ]
@@ -93,7 +81,7 @@ EOF
 		# iterate the physical interfaces and add them to the interfaces list and also add when ethdevice= called on cmdline
 		if [ "${method}" != dhcp ] || ([ ! -x /root/usr/sbin/NetworkManager ] && [ ! -x /root/usr/sbin/wicd ]) || [ ! -z "${ETHDEVICE}" ]
 		then
-			for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan*
+			for interface in /sys/class/net/eth* /sys/class/net/ath* /sys/class/net/wlan* /sys/class/net/en*
 			do
 				[ -e ${interface} ] || continue
 				i="$(basename ${interface})"