Better wpa-supplicant termination handling

diff --git a/wirelesslan/src/plugin.py b/wirelesslan/src/plugin.py
index 653ddef..b3a25cc 100644 (file)
--- a/wirelesslan/src/plugin.py
+++ b/wirelesslan/src/plugin.py
@@ -246,11 +246,11 @@ def configStrings(iface):
        driver = iNetwork.detectWlanModule()
        print "WLAN-MODULE",driver
        if driver == 'ralink':
-               return "        pre-up /usr/sbin/wpa_supplicant -i"+iface+" -c/etc/wpa_supplicant.conf -B -Dralink\n    post-down killall -q wpa_supplicant"
+               return "        pre-up /usr/sbin/wpa_supplicant -i"+iface+" -c/etc/wpa_supplicant.conf -B -Dralink\n    post-down wpa_cli terminate"
        if driver == 'madwifi':
-               return "        pre-up /usr/sbin/wpa_supplicant -i"+iface+" -c/etc/wpa_supplicant.conf -B -Dmadwifi\n   post-down killall -q wpa_supplicant"
+               return "        pre-up /usr/sbin/wpa_supplicant -i"+iface+" -c/etc/wpa_supplicant.conf -B -Dmadwifi\n   post-down wpa_cli terminate"
        if driver == 'zydas':
-               return "        pre-up /usr/sbin/wpa_supplicant -i"+iface+" -c/etc/wpa_supplicant.conf -B -Dzydas\n     post-down killall -q wpa_supplicant"
+               return "        pre-up /usr/sbin/wpa_supplicant -i"+iface+" -c/etc/wpa_supplicant.conf -B -Dzydas\n     post-down wpa_cli terminate"
 
 def Plugins(**kwargs):
        return PluginDescriptor(name=_("Wireless LAN"), description=_("Connect to a Wireless Network"), where = PluginDescriptor.WHERE_NETWORKSETUP, fnc={"ifaceSupported": callFunction, "configStrings": configStrings, "menuEntryName": lambda x: "Wireless Network Configuartion..."})