diff options
| author | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2008-08-26 10:56:57 +0000 |
|---|---|---|
| committer | Andreas Monzner <andreas.monzner@multimedia-labs.de> | 2008-08-26 10:56:57 +0000 |
| commit | ff483cd208f38b22aa9aeebba228bd361a3caf22 (patch) | |
| tree | 3e4a0381e377db4bae2e0d9bc6c5a0ce2a33585b /lib/python/Screens/NetworkSetup.py | |
| parent | 92362f1b73f1e61ad0cb1c581b318b360e0bb6fe (diff) | |
| download | enigma2-ff483cd208f38b22aa9aeebba228bd361a3caf22.tar.gz enigma2-ff483cd208f38b22aa9aeebba228bd361a3caf22.zip | |
network setup fixes
Diffstat (limited to 'lib/python/Screens/NetworkSetup.py')
| -rw-r--r-- | lib/python/Screens/NetworkSetup.py | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py index d9679bb1..29f9705f 100644 --- a/lib/python/Screens/NetworkSetup.py +++ b/lib/python/Screens/NetworkSetup.py @@ -390,23 +390,24 @@ class AdapterSetup(Screen, ConfigListScreen): def ok(self): iNetwork.setAdapterAttribute(self.iface, "up", self.activateInterfaceEntry.value) - if self.activateInterfaceEntry.value is True: - iNetwork.setAdapterAttribute(self.iface, "dhcp", self.dhcpConfigEntry.value) - iNetwork.setAdapterAttribute(self.iface, "ip", self.ipConfigEntry.value) - iNetwork.setAdapterAttribute(self.iface, "netmask", self.netmaskConfigEntry.value) - if self.hasGatewayConfigEntry.value: - iNetwork.setAdapterAttribute(self.iface, "gateway", self.gatewayConfigEntry.value) - else: - iNetwork.removeAdapterAttribute(self.iface, "gateway") - if self.extended is not None and self.configStrings is not None: - iNetwork.setAdapterAttribute(self.iface, "configStrings", self.configStrings(self.iface)) - self.ws.writeConfig() + #if self.activateInterfaceEntry.value is True: + iNetwork.setAdapterAttribute(self.iface, "dhcp", self.dhcpConfigEntry.value) + iNetwork.setAdapterAttribute(self.iface, "ip", self.ipConfigEntry.value) + iNetwork.setAdapterAttribute(self.iface, "netmask", self.netmaskConfigEntry.value) + if self.hasGatewayConfigEntry.value: + iNetwork.setAdapterAttribute(self.iface, "gateway", self.gatewayConfigEntry.value) else: - iNetwork.removeAdapterAttribute(self.iface, "ip") - iNetwork.removeAdapterAttribute(self.iface, "netmask") iNetwork.removeAdapterAttribute(self.iface, "gateway") + if self.extended is not None and self.configStrings is not None: + iNetwork.setAdapterAttribute(self.iface, "configStrings", self.configStrings(self.iface)) + self.ws.writeConfig() + #else: + # iNetwork.removeAdapterAttribute(self.iface, "ip") + # iNetwork.removeAdapterAttribute(self.iface, "netmask") + # iNetwork.removeAdapterAttribute(self.iface, "gateway") + # iNetwork.deactivateInterface(self.iface) + if self.activateInterfaceEntry.value is False: iNetwork.deactivateInterface(self.iface) - iNetwork.deactivateNetworkConfig() iNetwork.writeNetworkConfig() iNetwork.activateNetworkConfig() |