Minimize delta to Debian's upstream/master
[live-boot-grml.git] / components / 9990-grml-networking.sh
index 0d73e52..394d011 100644 (file)
@@ -94,7 +94,7 @@ iface ${interface} inet ${method}
 EOF
     else
       cat >> $IFFILE << EOF
-auto ${interface}
+allow-hotplug ${interface}
 iface ${interface} inet ${method}
 EOF
     fi
@@ -133,14 +133,14 @@ EOF
 done
 
 # dns bootoption
-if [ -n "$DNSSERVER1" ]
+if [ -n "$DNSSERVERS" ]
 then
        # disable any existing entries
        if [ -r $RESOLVCONF ]
        then
                sed -i 's/nameserver/# nameserver/' $RESOLVCONF
        fi
-       for i in $DNSSERVER1 $DNSSERVER2
+       for i in $DNSSERVERS
        do
                echo "nameserver $i" >> $RESOLVCONF
        done