fix writing nameserver to /etc/resolv.conf when no dhcp is used

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index 948b2fdf74ad17d3380a415e9dc44a4041be8602..7d6c5e17e5104118f3e784b5a7898520939b4307 100644 (file)
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -21,14 +21,11 @@ class Network:
                        fp.write("      address %d.%d.%d.%d\n" % tuple(config.network.ip.value))
                        fp.write("      netmask %d.%d.%d.%d\n" % tuple(config.network.netmask.value))
                        fp.write("      gateway %d.%d.%d.%d\n" % tuple(config.network.gateway.value))
+                       fp2 = file('/etc/resolv.conf', 'w')
+                       fp2.write("nameserver %d.%d.%d.%d\n" % tuple(config.network.dns.value))
+                       fp2.close()
                fp.close()
 
-               if (currentConfigSelectionElement(config.network.dhcp) == "yes"):
-                       fp = file('/etc/resolv.conf', 'w')
-                       fp.write("nameserver %d.%d.%d.%d\n" % tuple(config.network.dns.value))
-                       fp.close()              
-
-
        def loadNetworkConfig(self):
                try:
                        # parse the interfaces-file