kleine Aenderungen in der Gui und ein paar Dateien geloescht

[people/pmueller/ipfire-2.x.git] / src / initscripts / init.d / net / common / ipv4-static

diff --git a/src/initscripts/init.d/net/common/ipv4-static b/src/initscripts/init.d/net/common/ipv4-static
index a9d89a1dd1fdc446b519d73d6e102a8e6d6c5bef..081e0adbab09a693bdc0d6a240a93b475279e755 100644 (file)
--- a/src/initscripts/init.d/net/common/ipv4-static
+++ b/src/initscripts/init.d/net/common/ipv4-static
@@ -63,7 +63,6 @@ case "${2}" in
                                boot_mesg "Registering DNS server..."
                                echo $DNS1 > /var/ipfire/red/dns1
                                echo $DNS2 > /var/ipfire/red/dns2
-                               echo "nameserver 127.0.0.1" > /etc/resolv.conf
                                echo $ADDRESS > /var/ipfire/red/local-ipaddress
                                evaluate_retval
                        fi
@@ -76,7 +75,12 @@ case "${2}" in
                        ip route del default
                        evaluate_retval
                fi
-       
+               
+               if [ "${CONFIG_TYPE}" == "0" ] || [ "${CONFIG_TYPE}" == "" ]; then
+               boot_mesg "Restoring default DNS Proxy Adress in resolv.conf..."
+               echo "nameserver 127.0.0.1" > /etc/resolv.conf
+    fi
+       
                boot_mesg "Removing IPv4 address ${ADDRESS} from the ${1} interface..."
                ip addr del ${args} dev ${1}
                evaluate_retval