From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 7 May 2010 11:24:22 +0000 (+0000)
Subject: broadcom-wl: check iface pid file when invoking nas, fixes starting nas for additiona... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=bbb7850ae6487bc97e09ddb24ba32b59df4b0d7e;p=openwrt%2Fstaging%2Fjow.git

broadcom-wl: check iface pid file when invoking nas, fixes starting nas for additional wireless networks (#7255)

SVN-Revision: 21394
---

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