workaround for not working /etc/init.d/network script

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

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index 22271ec8ebb18b83445b167c2482c666a3a8b61b..5add0c01913aa0560a268514c68fa1f9bf129d17 100644 (file)
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -1,4 +1,4 @@
-from config import *
+from config import config, ConfigYesNo, ConfigIP, NoSave, ConfigSubsection, ConfigMAC
 
 import os
 from socket import *
@@ -11,22 +11,21 @@ class Network:
                # fixme restarting and updating the network too often. possible fix: check current config and execute only if changed :/
                # fixme using interfaces.tmp instead of interfaces for now
                fp = file('/etc/network/interfaces', 'w')
+               fp.write("auto lo\n")
+               fp.write("iface lo inet loopback\n\n")
                fp.write("auto eth0\n")
-               if (currentConfigSelectionElement(config.network.dhcp) == "yes"):
+               if config.network.dhcp.value:
                        fp.write("iface eth0 inet dhcp\n")
                else:
                        fp.write("iface eth0 inet static\n")
                        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
@@ -81,10 +80,18 @@ class Network:
                except:
                        print "[Network.py] parsing network failed"
 
+       def deactivateNetworkConfig(self):
+               import os
+               os.system("ip addr flush eth0")
+               os.system("/etc/init.d/networking stop")
+               os.system("killall -9 udhcpc")
+               os.system("rm /var/run/udhcpc*")
+
        def activateNetworkConfig(self):
                import os
-               os.system("/etc/init.d/networking restart")
+               os.system("/etc/init.d/networking start")
                config.network.ip.value = self.getCurrentIP()
+               config.network.ip.save()
                
        def setDHCP(self, useDHCP):
                if (useDHCP):
@@ -139,24 +146,16 @@ class Network:
 iNetwork = Network()
 
 def InitNetwork():
-       ip = iNetwork.getCurrentIP()
-
-               
        config.network = ConfigSubsection()
-       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"))
-       config.network.dns = configElement_nonSave("config.network.dns", configSequence, [192,168,1,3], configsequencearg.get("IP"))
-       config.network.mac = configElement_nonSave("config.network.mac", configSequence, [00,11,22,33,44,55], configsequencearg.get("MAC"))
+       config.network.dhcp = NoSave(ConfigYesNo(default=True))
+       config.network.ip = NoSave(ConfigIP(default=iNetwork.getCurrentIP()))
+       config.network.netmask = NoSave(ConfigIP(default=[255,255,255,0]))
+       config.network.gateway = NoSave(ConfigIP(default=[192,168,1,3]))
+       config.network.dns = NoSave(ConfigIP(default=[192,168,1,3]))
+       config.network.mac = NoSave(ConfigMAC(default=[00,11,22,33,44,55]))
 
        iNetwork.loadNetworkConfig()
        
-       #FIXME using this till other concept for this is implemented
-       #config.network.activate = configElement("config.network.activate", configSelection, 0, ("yes, sir", "you are my hero"))
-       #config.network.activate = configElement("config.network.activate", configSelection, 0, ("yes", "you are my hero"))
-
-
        def writeNetworkConfig(configElement):
                iNetwork.writeNetworkConfig()