Merge remote-tracking branch 'upstream/master'

[live-boot-grml.git] / components / 9990-netbase.sh

diff --git a/components/9990-netbase.sh b/components/9990-netbase.sh
index a32a47b..df8d080 100755 (executable)
--- 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})"