aboutsummaryrefslogtreecommitdiffstats
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
commitbbb7850ae6487bc97e09ddb24ba32b59df4b0d7e (patch)
tree4f0ac84ba646a092113a0d2f342bf507daef7ef1
parentc09610dd492a6fa2ea8f5afe6d047936eb48196e (diff)
downloadupstream-bbb7850ae6487bc97e09ddb24ba32b59df4b0d7e.tar.gz
upstream-bbb7850ae6487bc97e09ddb24ba32b59df4b0d7e.tar.bz2
upstream-bbb7850ae6487bc97e09ddb24ba32b59df4b0d7e.zip
broadcom-wl: check iface pid file when invoking nas, fixes starting nas for additional wireless networks (#7255)
SVN-Revision: 21394
-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