aboutsummaryrefslogtreecommitdiffstats
path: root/package/broadcom-wl/files
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-05-07 11:24:22 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-05-07 11:24:22 +0000
commit290c073d25ff02010c8ae6d6cfea505ef890515f (patch)
treeba67680e81558b1cb5f28f5d436e4362ce220387 /package/broadcom-wl/files
parenta3e63660dcd5aed7abc3c49bef55245f390fb19d (diff)
downloadupstream-290c073d25ff02010c8ae6d6cfea505ef890515f.tar.gz
upstream-290c073d25ff02010c8ae6d6cfea505ef890515f.tar.bz2
upstream-290c073d25ff02010c8ae6d6cfea505ef890515f.zip
[package] broadcom-wl: check iface pid file when invoking nas, fixes starting nas for additional wireless networks (#7255)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21394 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/broadcom-wl/files')
-rw-r--r--package/broadcom-wl/files/lib/wifi/broadcom.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index bfb7ed25ee..976665cb0b 100644
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -135,7 +135,6 @@ enable_broadcom() {
_c=0
nas="$(which nas)"
- [ -n "$nas" ] && nas="start-stop-daemon -S -b -x $nas -- "
nas_cmd=
if_up=
@@ -292,7 +291,9 @@ enable_broadcom() {
use_nas=0
}
}
- [ -z "$nas" -o "$use_nas" = "0" ] || nas_cmd="${nas_cmd:+$nas_cmd$N}$nas -P /var/run/nas.$ifname.pid -H 34954 ${bridge:+ -l $bridge} -i $ifname $nas_mode -m $auth -w $wsec -s \"\$${vif}_ssid\" -g 3600 $nasopts &"
+ [ -z "$nas" -o "$use_nas" = "0" ] || {
+ nas_cmd="${nas_cmd:+$nas_cmd$N}start-stop-daemon -S -b -p /var/run/nas.$ifname.pid -x $nas -- -P /var/run/nas.$ifname.pid -H 34954 ${bridge:+ -l $bridge} -i $ifname $nas_mode -m $auth -w $wsec -s \"\$${vif}_ssid\" -g 3600 $nasopts"
+ }
}
_c=$(($_c + 1))
done