diff options
| author | acid-burn <acid-burn@opendreambox.org> | 2011-03-15 13:09:15 +0100 |
|---|---|---|
| committer | acid-burn <acid-burn@opendreambox.org> | 2011-03-15 13:09:15 +0100 |
| commit | 5c3eb71d77a7c37ef29abaf9a578545d25171e41 (patch) | |
| tree | ee8b5c8276ee36f5f376c86274f3097b3ae34d64 | |
| parent | 057f9b4f5534a302c6e66431894724ae213985b1 (diff) | |
| parent | a0542da4384ee0e1589bd7b6ebc9211cdd239205 (diff) | |
| download | enigma2-5c3eb71d77a7c37ef29abaf9a578545d25171e41.tar.gz enigma2-5c3eb71d77a7c37ef29abaf9a578545d25171e41.zip | |
Merge remote branch 'origin/obi/bug_726_interfaces' into acid-burn/networking_changes
| -rwxr-xr-x | lib/python/Components/Network.py | 4 | ||||
| -rw-r--r-- | lib/python/Plugins/SystemPlugins/WirelessLan/plugin.py | 13 |
2 files changed, 8 insertions, 9 deletions
diff --git a/lib/python/Components/Network.py b/lib/python/Components/Network.py index e980cb8c..0a011236 100755 --- a/lib/python/Components/Network.py +++ b/lib/python/Components/Network.py @@ -171,11 +171,11 @@ class Network: if iface.has_key('gateway'): fp.write(" gateway %d.%d.%d.%d\n" % tuple(iface['gateway'])) if iface.has_key("configStrings"): - fp.write("\n" + iface["configStrings"] + "\n") + fp.write(iface["configStrings"]) if iface["preup"] is not False and not iface.has_key("configStrings"): fp.write(iface["preup"]) fp.write(iface["postdown"]) - fp.write("\n") + fp.write("\n") fp.close() self.writeNameserverConfig() 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..."}) |