diff options
| author | acid-burn <acid-burn@opendreambox.org> | 2011-03-16 16:13:20 +0100 |
|---|---|---|
| committer | acid-burn <acid-burn@opendreambox.org> | 2011-03-16 16:13:20 +0100 |
| commit | 2404d9d809e8c9704383c85475f50b0be55949a7 (patch) | |
| tree | e7ef6863f3f4ccbd8fba8fc968f468068cffdc57 /lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py | |
| parent | a12fae872b0ab0de222ba8fa1293213d307e60e4 (diff) | |
| parent | b01bf73f4857b2a1facaaf1fe556459676fe01e0 (diff) | |
| download | enigma2-2404d9d809e8c9704383c85475f50b0be55949a7.tar.gz enigma2-2404d9d809e8c9704383c85475f50b0be55949a7.zip | |
Merge branch 'acid-burn/networking_changes'
Diffstat (limited to 'lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py')
| -rw-r--r-- | lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py b/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py index adf47f0f..efec340a 100644 --- a/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py +++ b/lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py @@ -454,13 +454,12 @@ def configStrings(iface): driver = iNetwork.detectWlanModule(iface) else: driver = 'dreambox' - if driver in ('ralink', 'zydas'): - return " pre-up /usr/sbin/wpa_supplicant -i"+iface+" -c/etc/wpa_supplicant.conf -B -D"+driver+"\n post-down wpa_cli terminate" - else: - if config.plugins.wlan.essid.value == "hidden...": - return ' pre-up iwconfig '+iface+' essid "'+config.plugins.wlan.hiddenessid.value+'"\n pre-up /usr/sbin/wpa_supplicant -i'+iface+' -c/etc/wpa_supplicant.conf -B -dd -D'+driver+'\n post-down wpa_cli terminate' - else: - return ' pre-up iwconfig '+iface+' essid "'+config.plugins.wlan.essid.value+'"\n pre-up /usr/sbin/wpa_supplicant -i'+iface+' -c/etc/wpa_supplicant.conf -B -dd -D'+driver+'\n post-down wpa_cli terminate' + ret = "" + if driver == 'madwifi' and config.plugins.wlan.essid.value == "hidden...": + ret += "\tpre-up iwconfig " + iface + " essid \"" + config.plugins.wlan.hiddenessid.value + "\" || true\n" + ret += "\tpre-up wpa_supplicant -i" + iface + " -c/etc/wpa_supplicant.conf -B -dd -D" + driver + " || true\n" + ret += "\tpre-down wpa_cli -i" + iface + " terminate || true\n" + return ret def Plugins(**kwargs): return PluginDescriptor(name=_("Wireless LAN"), description=_("Connect to a Wireless Network"), where = PluginDescriptor.WHERE_NETWORKSETUP, needsRestart = False, fnc={"ifaceSupported": callFunction, "configStrings": configStrings, "WlanPluginEntry": lambda x: "Wireless Network Configuartion..."}) |