diff options
| author | Fraxinas <andreas.frisch@multimedia-labs.de> | 2008-11-14 16:32:13 +0100 |
|---|---|---|
| committer | Fraxinas <andreas.frisch@multimedia-labs.de> | 2008-11-14 16:32:13 +0100 |
| commit | 06aa9b9569bdaf23d2d73f75dd7658d7721f4574 (patch) | |
| tree | 8465c67d209990069810fdfcca474e316a2db493 /lib/python/Components/Network.py | |
| parent | 7cd404df03f85b78738c2650b45479e74e093d0b (diff) | |
| parent | d2c353af6c84de0958ed56ef817e67f21934f59c (diff) | |
| download | enigma2-06aa9b9569bdaf23d2d73f75dd7658d7721f4574.tar.gz enigma2-06aa9b9569bdaf23d2d73f75dd7658d7721f4574.zip | |
Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/python/Components/Network.py')
| -rwxr-xr-x | lib/python/Components/Network.py | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py index 7cc61d84..f32a648c 100755 --- a/lib/python/Components/Network.py +++ b/lib/python/Components/Network.py @@ -63,6 +63,8 @@ class Network: def getDataForInterface(self, iface,callback): #get ip out of ip addr, as avahi sometimes overrides it in ifconfig. + if not self.Console: + self.Console = Console() cmd = "ip -o addr" self.Console.ePopen(cmd, self.IPaddrFinished, [iface,callback]) @@ -212,15 +214,16 @@ class Network: for ifacename, iface in ifaces.items(): if self.ifaces.has_key(ifacename): self.ifaces[ifacename]["dhcp"] = iface["dhcp"] - if len(self.Console.appContainers) == 0: - # save configured interfacelist - self.configuredNetworkAdapters = self.configuredInterfaces - # load ns only once - self.loadNameserverConfig() - print "read configured interfac:", ifaces - print "self.ifaces after loading:", self.ifaces - if callback is not None: - callback(True) + if self.Console: + if len(self.Console.appContainers) == 0: + # save configured interfacelist + self.configuredNetworkAdapters = self.configuredInterfaces + # load ns only once + self.loadNameserverConfig() + print "read configured interfac:", ifaces + print "self.ifaces after loading:", self.ifaces + if callback is not None: + callback(True) def loadNameserverConfig(self): ipRegexp = "[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}" |
