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

SVN-Revision: 21394
This commit is contained in:
Jo-Philipp Wich 2010-05-07 11:24:22 +00:00
parent c09610dd49
commit bbb7850ae6

View file

@ -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