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

Allow wpa_cli_$IFACE to too send args to wpa_cli.

Browse Source
This commit is contained in:
Roy Marples 2009-01-21 09:25:34 +00:00
parent 417a817d25
commit 4f163f9b9a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
net/wpa_supplicant.sh
View File

@ -1,4 +1,4 @@
# Copyright 2007-2008 Roy Marples <roy@marples.name> # Copyright 2007-2009 Roy Marples <roy@marples.name>
# All rights reserved. Released under the 2-clause BSD license. # All rights reserved. Released under the 2-clause BSD license.
wpa_supplicant_depend() wpa_supplicant_depend()
@ -45,7 +45,7 @@ fi
wpa_supplicant_pre_start() wpa_supplicant_pre_start()
{ {
local opts= cfgfile= ctrl_dir= wireless=true local opts= cliopts= cfgfile= ctrl_dir= wireless=true
local wpas=/usr/sbin/wpa_supplicant wpac=/usr/bin/wpa_cli local wpas=/usr/sbin/wpa_supplicant wpac=/usr/bin/wpa_cli
local actfile=/etc/wpa_supplicant/wpa_cli.sh local actfile=/etc/wpa_supplicant/wpa_cli.sh
@ -57,6 +57,8 @@ wpa_supplicant_pre_start()
[ -e "${actfile}" ] || unset wpac [ -e "${actfile}" ] || unset wpac
eval opts=\$wpa_supplicant_${IFVAR} eval opts=\$wpa_supplicant_${IFVAR}
eval cliopts=\$wpa_cli_${IFVAR}
[ -z "${cliopts}" ] && cliopts=${wpa_cli}
case " ${opts} " in case " ${opts} " in
*" -Dwired "*) wireless=false;; *" -Dwired "*) wireless=false;;
*) _is_wireless || return 0;; *) _is_wireless || return 0;;
@ -157,7 +159,7 @@ wpa_supplicant_pre_start()
ebegin "Starting wpa_cli on" "${IFACE}" ebegin "Starting wpa_cli on" "${IFACE}"
start-stop-daemon --start --exec "${wpac}" \ start-stop-daemon --start --exec "${wpac}" \
--pidfile "/var/run/wpa_cli-${IFACE}.pid" \ --pidfile "/var/run/wpa_cli-${IFACE}.pid" \
-- -a "${actfile}" -p "${ctrl_dir}" -i "${IFACE}" \ -- ${cliopts} -a "${actfile}" -p "${ctrl_dir}" -i "${IFACE}" \
-P "/var/run/wpa_cli-${IFACE}.pid" -B -P "/var/run/wpa_cli-${IFACE}.pid" -B
if eend $?; then if eend $?; then
ebegin "Backgrounding ..." ebegin "Backgrounding ..."