new settings-restore will start the network now

lib/python/Components/Network.py

@@ -650,34 +650,14 @@ def hotplug(self, event):
 				pass
 
 
-iNetwork = Network()
-
+def waitForNetwork(self, timeout=15):
+	while timeout > 0:
+		gws = ni.gateways()
+		if 'default' in gws and len(gws['default']) > 0:
+			print("[waitForNetwork] Online, reload interface data")
+			iNetwork.getInterfaces()
+			return
+		print("[waitForNetwork] Not online yet (%d)" % (timeout))
 
-class NetworkCheck:
-	def __init__(self):
-		self.Timer = eTimer()
-		self.Timer.callback.append(self.startCheckNetwork)
 
-	def startCheckNetwork(self):
-		self.Timer.stop()
-		if self.Retry > 0:
-			try:
-				gws = ni.gateways()
-				if 'default' in gws and len(gws['default']) > 0:
-					print("[NetworkCheck] CheckNetwork - Done - Reload interface data")
-					iNetwork.getInterfaces()
-					return
-				self.Retry = self.Retry - 1
-				self.Timer.start(1000, True)
-			except Exception as e:
-				print("[NetworkCheck] CheckNetwork - Error: %s" % str(e))
-
-	def Start(self, seconds=30):
-		self.Retry = seconds
-		self.Timer.start(1000, True)
-
-
-def InitNetwork():
-	global networkCheck
-	networkCheck = NetworkCheck()
-	networkCheck.Start()
+iNetwork = Network()

lib/python/Screens/StartWizard.py

@@ -9,7 +9,6 @@
 except:
 	OverscanWizard = None
 
-from Components.Network import iNetwork, NetworkCheck
 from Components.Pixmap import Pixmap
 from Components.ProgressBar import ProgressBar
 from Components.Label import Label
@@ -84,9 +83,6 @@ def close(self, value):
 				# restore network config first, we need it to autoinstall
 				self.console = eConsoleAppContainer()
 				self.console.execute('/etc/init.d/settings-restore.sh network')
-				iNetwork.restartNetwork()
-				networkCheck = NetworkCheck()
-				networkCheck.Start(10)
 				self.session.open(AutoInstall)
 		MessageBox.close(self)
 

lib/python/StartEnigma.py

@@ -582,7 +582,7 @@ def runNextScreen(session, screensToRun, *result):
 
 profile("Network")
 import Components.Network
-Components.Network.InitNetwork()
+Components.Network.waitForNetwork()
 
 profile("LCD")
 import Components.Lcd