From 0f5eb3ef064c4a62a5ba3c8f4733f8e61556687b Mon Sep 17 00:00:00 2001
From: Jouke Witteveen <j.witteveen@gmail.com>
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/wifi-menu | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'scripts/wifi-menu')

diff --git a/scripts/wifi-menu b/scripts/wifi-menu
index 3d7ed57..bbc2bf5 100755
--- a/scripts/wifi-menu
+++ b/scripts/wifi-menu
@@ -4,9 +4,6 @@
 . "$SUBR_DIR/8021x"
 . /etc/conf.d/netcfg
 
-# The right value depends on the connected profile.
-WPA_CTRL_PATH=/run/wpa_supplicant
-
 usage()
 {
     cat << END
@@ -211,8 +208,7 @@ if ! interface_is_up "$INTERFACE"; then
 fi
 
 report_try "Scanning for networks"
-CONNECTION=$(wpa_cli -p "$WPA_CTRL_PATH" -i "$INTERFACE" status 2> /dev/null \
-                 | grep -m 1 "^ssid=")
+CONNECTION=$(wpa_call "$INTERFACE" status 2> /dev/null | grep -m 1 "^ssid=")
 CONNECTION=${CONNECTION#ssid=}
 NETWORKS=$(wpa_supplicant_scan_info "$INTERFACE" 3,4,5)
 if [[ $? -eq 0 ]]; then
-- 
cgit v1.2.3-24-g4f1b