diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2009-03-28 21:30:07 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2009-03-28 21:30:07 +0000 |
| commit | 2a59f52a0f057a15d1f3ea79796a2951490f8a8c (patch) | |
| tree | 2c4e281b7c82329ef804f3a67f89dabe42c4075d /package | |
| parent | bad948c2772f9c147cd9c9c6c4c598a71261c4ed (diff) | |
| download | openwrt-2a59f52a0f057a15d1f3ea79796a2951490f8a8c.tar.gz openwrt-2a59f52a0f057a15d1f3ea79796a2951490f8a8c.tar.bz2 openwrt-2a59f52a0f057a15d1f3ea79796a2951490f8a8c.zip | |
fix unparsable options generated by wpa_supplicant.sh (#4835)
SVN-Revision: 15058
Diffstat (limited to 'package')
| -rw-r--r-- | package/wpa_supplicant/Makefile | 2 | ||||
| -rw-r--r-- | package/wpa_supplicant/files/wpa_supplicant.sh | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile index c1592a9a70..006d0777d4 100644 --- a/package/wpa_supplicant/Makefile +++ b/package/wpa_supplicant/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wpa_supplicant PKG_VERSION:=0.6.9 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MD5SUM:=0efb8fcedf0a8acf6f423dfdb0658fdd PKG_SOURCE_URL:=http://hostap.epitest.fi/releases diff --git a/package/wpa_supplicant/files/wpa_supplicant.sh b/package/wpa_supplicant/files/wpa_supplicant.sh index 519f2553a6..5053d1e285 100644 --- a/package/wpa_supplicant/files/wpa_supplicant.sh +++ b/package/wpa_supplicant/files/wpa_supplicant.sh @@ -32,7 +32,7 @@ wpa_supplicant_setup_vif() { proto='WPA2' key_mgmt='WPA-EAP' config_get ca_cert "$vif" ca_cert - ca_cert="ca_cert=\"$ca_cert\"" + ca_cert=${ca_cert:+"ca_cert=\"$ca_cert\""} case "$eap_type" in tls|TLS) pairwise='pairwise=CCMP' @@ -51,17 +51,20 @@ wpa_supplicant_setup_vif() { password="password=\"$password\"" ;; esac - eap_type="eap_type=$(echo $eap_type | tr 'a-z' 'A-Z')" + eap_type="eap=$(echo $eap_type | tr 'a-z' 'A-Z')" ;; esac config_get ifname "$vif" ifname config_get bridge "$vif" bridge config_get ssid "$vif" ssid + config_get bssid "$vif" bssid + bssid=${bssid:+"bssid=$bssid"} cat > /var/run/wpa_supplicant-$ifname.conf <<EOF ctrl_interface=/var/run/wpa_supplicant-$ifname network={ scan_ssid=1 ssid="$ssid" + $bssid key_mgmt=$key_mgmt proto=$proto $passphrase |