Merge commit 'origin/bug_449_fix_wlan_usbstick_recognition'
authoracid-burn <acid-burn@opendreambox.org>
Wed, 31 Mar 2010 08:42:40 +0000 (10:42 +0200)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 31 Mar 2010 08:42:40 +0000 (10:42 +0200)
1  2 
lib/python/Components/Network.py

@@@ -14,7 -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()
                                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