aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2009-03-28 21:30:07 +0000
committerJo-Philipp Wich <jow@openwrt.org>2009-03-28 21:30:07 +0000
commit6006799af7b2070c50f72429c978bfaeff26f263 (patch)
treea32deec0f6b739923985ab272afba11aaa94b0e9
parentbf44f7b388dd8d9d7fd99e2aabdfd1eb72b675bd (diff)
downloadupstream-6006799af7b2070c50f72429c978bfaeff26f263.tar.gz
upstream-6006799af7b2070c50f72429c978bfaeff26f263.tar.bz2
upstream-6006799af7b2070c50f72429c978bfaeff26f263.zip
[package] fix unparsable options generated by wpa_supplicant.sh (#4835)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15058 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/wpa_supplicant/Makefile2
-rw-r--r--package/wpa_supplicant/files/wpa_supplicant.sh7
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