X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/2f4307c2159e1e927f1e0a308e2d8ae45dacbdad..0e321af7afb77c88d4d880d66ea657d1e4e1e67e:/lib/python/Screens/NetworkSetup.py

diff --git a/lib/python/Screens/NetworkSetup.py b/lib/python/Screens/NetworkSetup.py
index c2d9fc4d..29f9705f 100644
--- a/lib/python/Screens/NetworkSetup.py
+++ b/lib/python/Screens/NetworkSetup.py
@@ -45,7 +45,7 @@ def InterfaceEntryComponent(index,name,default,active ):
 class NetworkAdapterSelection(Screen):
 	def __init__(self, session):
 		Screen.__init__(self, session)
-		iNetwork.getInterfaces()
+
 		self.wlan_errortext = _("No working wireless networkadapter found.\nPlease verify that you have attached a compatible WLAN USB Stick and your Network is configured correctly.")
 		self.lan_errortext = _("No working local networkadapter found.\nPlease verify that you have attached a network cable and your Network is configured correctly.")
 		
@@ -74,8 +74,14 @@ class NetworkAdapterSelection(Screen):
 
 	def updateList(self):
 		print "update list"
+		iNetwork.getInterfaces()
 		self.list = []
 		default_gw = None
+		num_configured_if = len(iNetwork.configuredInterfaces)
+		print "num_configured_if :",num_configured_if 
+		if num_configured_if < 2 and os_path.exists("/etc/default_gw"):
+			unlink("/etc/default_gw")
+			
 		if os_path.exists("/etc/default_gw"):
 			fp = file('/etc/default_gw', 'r')
 			result = fp.read()
@@ -110,9 +116,11 @@ class NetworkAdapterSelection(Screen):
 			fp.write(selection[0])
 			fp.close()
 			iNetwork.restartNetwork()
+			self.updateList()
 		elif old_default_gw and num_if < 2:
 			unlink("/etc/default_gw")
 			iNetwork.restartNetwork()
+			self.updateList()
 
 	def okbuttonClick(self):
 		selection = self["list"].getCurrent()
@@ -123,6 +131,8 @@ class NetworkAdapterSelection(Screen):
 	def AdapterSetupClosed(self, *ret):
 		if len(self.adapters) == 1:
 			self.close()
+		else:
+			self.updateList()
 
 	def NetworkFallback(self):
 		if iNetwork.configuredInterfaces.has_key('wlan0') is True:
@@ -380,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()