From fc23cd7aa9a29eef1c7e37fe12fcef5bbd3dc126 Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 7 May 2010 11:24:22 +0000
Subject: [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
---
 package/broadcom-wl/files/lib/wifi/broadcom.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'package')

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
-- 
cgit v1.2.3