summaryrefslogtreecommitdiffstats
path: root/wpa_actiond
diff options
context:
space:
mode:
authorJames Rayner <james@archlinux.org>2009-09-27 16:37:22 +0200
committerJames Rayner <james@archlinux.org>2009-09-27 16:37:22 +0200
commit83ad2000a37e6e2f2bf658553c7997c7f03459d1 (patch)
tree5d8a0c3532b2064f1f018e7dce7b0966766def42 /wpa_actiond
parentdf2c2b5c04393ed72c2798407f50f99a6298b673 (diff)
downloadnetctl-83ad2000a37e6e2f2bf658553c7997c7f03459d1.tar.gz
netctl-83ad2000a37e6e2f2bf658553c7997c7f03459d1.tar.xz
Add stop to netcfg-wpa_actiond, default to WPA2, then WPA.
Diffstat (limited to 'wpa_actiond')
-rwxr-xr-xwpa_actiond/netcfg-wpa_actiond26
1 files changed, 20 insertions, 6 deletions
diff --git a/wpa_actiond/netcfg-wpa_actiond b/wpa_actiond/netcfg-wpa_actiond
index 02901c6..1242a73 100755
--- a/wpa_actiond/netcfg-wpa_actiond
+++ b/wpa_actiond/netcfg-wpa_actiond
@@ -1,14 +1,28 @@
-
+#! /bin/bash
. /usr/lib/network/network
. /usr/lib/network/8021x
. /usr/lib/network/wireless
-interface=$1; shift
-
AUTOWIFI="/usr/sbin/wpa_actiond"
ACTION_SCRIPT="/usr/bin/netcfg-wpa_actiond-action"
-PIDFILE="/var/run/wpa_supplicant_${interface}.pid"
-EXTRA_AUTOWIFI_OPTIONS="$*"
+PIDFILE="/var/run/wpa_actiond_${interface}.pid"
+
+case $1 in
+ help)
+ echo "netcfg-wpa_actiond <interface>"
+ echo "netcfg-wpa_actiond stop <interface>"
+ exit
+ ;;
+ stop)
+ stop_wpa $2
+ kill $(cat $PIDFILE)
+ exit
+ ;;
+ *)
+ interface=$1; shift
+ EXTRA_AUTOWIFI_OPTIONS="$*"
+ ;;
+esac
if [[ -z $interface ]]; then
echo "No interface specified"
@@ -45,7 +59,7 @@ done
stop_wpa "$interface"
if start_wpa $interface $WPA_CONF $WPA_DRIVER $WPA_OPTS; then
- if $AUTOWIFI -i ${interface} -P {PIDFILE} -a ${ACTION_SCRIPT} ${EXTRA_AUTOWIFI_OPTIONS}; then
+ if $AUTOWIFI -i ${interface} -P ${PIDFILE} -a ${ACTION_SCRIPT} ${EXTRA_AUTOWIFI_OPTIONS}; then
exit 0
fi
fi