X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FNetwork.py;h=b9da48d8116c12b90ce1483141141c284cc05d1f;hp=bd10d9c3e2360da293c93e077100259bca3b04dd;hb=97d46aee1158e549c110d66a0e1c4185c3cbbdf3;hpb=786a5a906d13ec5832fbecf5c4fa5421f2cac790

diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py
index bd10d9c..b9da48d 100755
--- a/lib/python/Components/Network.py
+++ b/lib/python/Components/Network.py
@@ -14,7 +14,7 @@ class Network:
 		self.NetworkState = 0
 		self.DnsState = 0
 		self.nameservers = []
-		self.ethtool_bin = "/usr/sbin/ethtool"
+		self.ethtool_bin = "ethtool"
 		self.container = eConsoleAppContainer()
 		self.Console = Console()
 		self.LinkConsole = Console()
@@ -234,7 +234,7 @@ class Network:
 				self.configuredNetworkAdapters = self.configuredInterfaces
 				# load ns only once	
 				self.loadNameserverConfig()
-				print "read configured interfac:", ifaces
+				print "read configured interface:", ifaces
 				print "self.ifaces after loading:", self.ifaces
 				self.config_ready = True
 				self.msgPlugins()
@@ -425,6 +425,7 @@ class Network:
 
 	def checkNetworkState(self,statecallback):
 		# www.dream-multimedia-tv.de, www.heise.de, www.google.de
+		self.NetworkState = 0
 		cmd1 = "ping -c 1 82.149.226.170"
 		cmd2 = "ping -c 1 193.99.144.85"
 		cmd3 = "ping -c 1 209.85.135.103"
@@ -579,11 +580,11 @@ class Network:
 				self.wlanmodule = 'madwifi'
 		if os_path.exists(rt73_dir):
 			rtfiles = listdir(rt73_dir)
-			if len(rtfiles) == 2:
+			if len(rtfiles) == 2 or len(rtfiles) == 5:
 				self.wlanmodule = 'ralink'
 		if os_path.exists(zd1211b_dir):
 			zdfiles = listdir(zd1211b_dir)
-			if len(zdfiles) == 1:
+			if len(zdfiles) == 1 or len(zdfiles) == 5:
 				self.wlanmodule = 'zydas'
 		return self.wlanmodule