emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BSD shouldn't need to use wpa_cli to manage link events

Browse Source
This commit is contained in:
Roy Marples 2007-11-21 15:39:43 +00:00
parent 58bea85f92
commit 2b1a864bc4
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/wpa_supplicant.sh
View File

@ -70,6 +70,7 @@ wpa_supplicant_pre_start() {
wpas=/sbin/wpa_supplicant wpas=/sbin/wpa_supplicant
wpac=/bin/wpa_cli wpac=/bin/wpa_cli
fi fi
[ "${RC_UNAME}" = "Linux" ] || unset wpac
eval opts=\$wpa_supplicant_${IFVAR} eval opts=\$wpa_supplicant_${IFVAR}
case " ${opts} " in case " ${opts} " in
@ -92,7 +93,6 @@ wpa_supplicant_pre_start() {
save_options "SSID" "" save_options "SSID" ""
ebegin "Starting wpa_supplicant on" "${IFVAR}" ebegin "Starting wpa_supplicant on" "${IFVAR}"
if [ -x /sbin/iwconfig ] ; then if [ -x /sbin/iwconfig ] ; then
local x= local x=
for x in txpower rate rts frag ; do for x in txpower rate rts frag ; do
@ -139,11 +139,21 @@ wpa_supplicant_pre_start() {
actfile="/etc/wpa_supplicant/wpa_cli.sh" actfile="/etc/wpa_supplicant/wpa_cli.sh"
if [ -n "${wpac}" ]; then
opts="${opts} -W"
else
sleep 2 # FBSD 7.0 beta2 bug
mark_service_inactive "${SVCNAME}"
fi
start-stop-daemon --start --exec "${wpas}" \ start-stop-daemon --start --exec "${wpas}" \
--pidfile "/var/run/wpa_supplicant-${IFACE}.pid" \ --pidfile "/var/run/wpa_supplicant-${IFACE}.pid" \
-- ${opts} -W -B -i "${IFACE}" \ -- ${opts} -B -i "${IFACE}" \
-P "/var/run/wpa_supplicant-${IFACE}.pid" -P "/var/run/wpa_supplicant-${IFACE}.pid"
eend $? || return 1 eend $? || return 1
if [ -z "${wpac}" ]; then
ebegin "Backgrounding ..."
exit 1
fi
# Starting wpa_supplication-0.4.0, we can get wpa_cli to # Starting wpa_supplication-0.4.0, we can get wpa_cli to
# start/stop our scripts from wpa_supplicant messages # start/stop our scripts from wpa_supplicant messages