Merge branch 'debian-next' into master-next

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

diff --git a/scripts/boot/9990-netbase.sh b/scripts/boot/9990-netbase.sh
index 384f3f6..b3f886c 100755 (executable)
--- a/scripts/boot/9990-netbase.sh
+++ b/scripts/boot/9990-netbase.sh
@@ -65,11 +65,13 @@ EOF
 
                        if [ -n "${nameserver}" ]
                        then
+                               if [ -e "${DNSFILE}" ]
+                               then
+                                       grep -v ^nameserver "${DNSFILE}" > "${DNSFILE}.tmp"
+                                       mv "${DNSFILE}.tmp" "${DNSFILE}"
+                               fi
 
-cat >> "${DNSFILE}" << EOF
-nameserver ${nameserver}
-EOF
-
+                               echo "nameserver ${nameserver}" >> "${DNSFILE}"
                        fi
                done
        else
@@ -133,20 +135,5 @@ EOF
                fi
        fi
 
-       #if [ ! -x /root/usr/sbin/NetworkManager ]
-       #then
-       #       for i in eth0 eth1 eth2 ath0 wlan0
-       #       do
-       #               grep -q "iface ${i}" ${IFFILE} && continue
-       #
-       #cat >> "${IFFILE}" << EOF
-       #allow-hotplug ${i}
-       #iface ${i} inet dhcp
-       #
-       #EOF
-       #
-       #       done
-       #fi
-
        log_end_msg
 }