[package] hostapd,wpa_supplicant: create control interfaces for hostapd_cli and wpa_cli

[openwrt/svn-archive/archive.git] / package / wpa_supplicant / files / wpa_supplicant.sh

diff --git a/package/wpa_supplicant/files/wpa_supplicant.sh b/package/wpa_supplicant/files/wpa_supplicant.sh
index 37ebef7a4b4a44f53f817f25cf1f9d37899a6875..519f2553a64cee40653d4112133bdcf8c5ee93f1 100644 (file)
--- a/package/wpa_supplicant/files/wpa_supplicant.sh
+++ b/package/wpa_supplicant/files/wpa_supplicant.sh
@@ -28,7 +28,7 @@ wpa_supplicant_setup_vif() {
                                ;;
                        esac
                ;;
-               WPA|wpa|WPA2|wpa2i|8021x|8021X)
+               WPA|wpa|WPA2|wpa2|8021x|8021X)
                        proto='WPA2'
                        key_mgmt='WPA-EAP'
                        config_get ca_cert "$vif" ca_cert
@@ -58,6 +58,7 @@ wpa_supplicant_setup_vif() {
        config_get bridge "$vif" bridge
        config_get ssid "$vif" ssid
        cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
+ctrl_interface=/var/run/wpa_supplicant-$ifname
 network={
        scan_ssid=1
        ssid="$ssid"
@@ -75,5 +76,5 @@ network={
        $password
 }
 EOF
-       [ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B -D ${driver:-wext} -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
+       [ -z "$proto" ] || wpa_supplicant ${bridge:+ -b $bridge} -B -P "/var/run/wifi-${ifname}.pid" -D ${driver:-wext} -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf
 }