From 0f5eb3ef064c4a62a5ba3c8f4733f8e61556687b Mon Sep 17 00:00:00 2001 From: Jouke Witteveen Date: Thu, 5 Jul 2012 13:17:13 +0200 Subject: Rethink management of socket location for wpa_supplicant This may be set in a custom supplicant configuration file. All this is needed to cater for that. The new name of the tracking variable is WPA_CTRL_DIR, conform the environment variable of wpa_cli -a. --- scripts/netcfg-wpa_actiond | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'scripts/netcfg-wpa_actiond') diff --git a/scripts/netcfg-wpa_actiond b/scripts/netcfg-wpa_actiond index 744b7af..f2d2382 100755 --- a/scripts/netcfg-wpa_actiond +++ b/scripts/netcfg-wpa_actiond @@ -18,7 +18,6 @@ case $1 in interface=$2 [[ -f "$IFACE_DIR/$interface" ]] && source "$IFACE_DIR/$interface" netcfg -D "$interface" - stop_wpa "$interface" kill $(< "/run/wpa_actiond_${2}.pid") # only try to disable software rfkill switches (FS#25514) if [[ "$RFKILL" == "soft" ]]; then @@ -81,7 +80,7 @@ done WPA_OPTS="-W $WPA_OPTS" # Kill any existing wpa_supplicant on this interface -stop_wpa "$interface" +stop_wpa "$interface" &> /dev/null if start_wpa $interface $WPA_CONF $WPA_DRIVER $WPA_OPTS; then if $AUTOWIFI -i ${interface} -P ${PIDFILE} -a ${ACTION_SCRIPT} ${EXTRA_AUTOWIFI_OPTIONS}; then -- cgit v1.2.3-24-g4f1b