fix inverted setting (meaning was inverted too)

[enigma2.git] / lib / python / Components / Network.py

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index 6d28b19d3e6ea0595acba9544a7bfadaad8c4c0e..590edefdf6a26e1b000583ccbab1e3c677199c38 100644 (file)
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -12,9 +12,8 @@ class Network:
                # fixme using interfaces.tmp instead of interfaces for now
                fp = file('/etc/network/interfaces', 'w')
                fp.write("auto eth0\n")
-               if (config.network.dhcp.value == _("yes")):
+               if (config.network.dhcp.value == 1):
                        fp.write("iface eth0 inet dhcp\n")
-                       fp.write("      address %d.%d.%d.%d\n" % tuple(config.network.ip.value))
                else:
                        fp.write("iface eth0 inet static\n")
                        fp.write("      address %d.%d.%d.%d\n" % tuple(config.network.ip.value))
@@ -22,6 +21,12 @@ class Network:
                        fp.write("      gateway %d.%d.%d.%d\n" % tuple(config.network.gateway.value))
                fp.close()
 
+               if config.network.dhcp.value == 0:
+                       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
@@ -49,7 +54,7 @@ class Network:
                                                ifaces[currif]["gateway"] = map(int, split[1].split('.'))                                                                       
                        
                        # parse the resolv.conf-file
-                       fp = file('/etc/network/interfaces', 'r')
+                       fp = file('/etc/resolv.conf', 'r')
                        resolv = fp.readlines()
                        fp.close()
                except:
@@ -121,12 +126,14 @@ class Network:
                #self.writeNetworkConfig()              
 
        def getCurrentIP(self):
-               ip = [0, 0, 0, 0]
-               try:
-                       print gethostbyname(gethostname())
-                       ip = gethostbyname(gethostname()).split('.')
-               except:
-                       print "[Network.py] Could not get current ip (not necessarily an error)"
+               ipstr = [0,0,0,0]
+               for x in os.popen("ifconfig eth0 | grep 'inet addr:'", "r").readline().split(' '):
+                       if x.split(':')[0] == "addr":
+                               ipstr = x.split(':')[1].split('.')
+               ip = []
+               for x in ipstr:
+                       ip.append(int(x))
+               print "[Network.py] got ip " + str(ip)
                return ip
 
 iNetwork = Network()
@@ -136,7 +143,7 @@ def InitNetwork():
 
                
        config.network = ConfigSubsection()
-       config.network.dhcp = configElement_nonSave("config.network.dhcp", configSelection, 1, (_("no"), _("yes")))
+       config.network.dhcp = configElement_nonSave("config.network.dhcp", configSelection, 1, (("no", _("no")), ("yes", _("yes"))))
        config.network.ip = configElement_nonSave("config.network.ip", configSequence, ip, configsequencearg.get("IP"))
        config.network.netmask = configElement_nonSave("config.network.netmask", configSequence, [255,255,255,0], configsequencearg.get("IP"))
        config.network.gateway = configElement_nonSave("config.network.gateway", configSequence, [192,168,1,3], configsequencearg.get("IP"))