From b03df4ad75e90fb3663d6937635c34a7bce3e941 Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Mon, 6 Feb 2006 23:24:31 +0000 Subject: [PATCH] fix writing nameserver to /etc/resolv.conf when no dhcp is used --- lib/python/Components/Network.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py index 948b2fdf..7d6c5e17 100644 --- 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 -- 2.30.2