diff options
| author | Rémy Oudompheng <remy@archlinux.org> | 2011-07-30 20:57:29 +0200 |
|---|---|---|
| committer | Rémy Oudompheng <remy@archlinux.org> | 2011-07-30 20:57:29 +0200 |
| commit | a1fc17107a833d0a55bca8b14d3244b7788adf86 (patch) | |
| tree | b5082b7eaeb2f6b8f784a586217099ada69196d9 /src/8021x | |
| parent | 20603a6e06f16b82267fac9c8cd90d0113b36e92 (diff) | |
| download | netctl-a1fc17107a833d0a55bca8b14d3244b7788adf86.tar.gz netctl-a1fc17107a833d0a55bca8b14d3244b7788adf86.tar.xz | |
Use configured control path for wpa_supplicant (FS#24949)
Otherwise the wpa_cli calls may fail if the specified
ctrl_interface directory differs from the default one.
Signed-off-by: Rémy Oudompheng <remy@archlinux.org>
Diffstat (limited to 'src/8021x')
| -rw-r--r-- | src/8021x | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,5 +1,3 @@ -WPA_CTRL_PATH=/run/wpa_supplicant - # Uses wpa_supplicant to check for association to a network # wpa_check interface [timeout] wpa_check() @@ -7,6 +5,7 @@ wpa_check() local timeout=0 INTERFACE="$1" TIMEOUT="${2:-15}" CONDITION="${3:-COMPLETED}" # CONDITION is required as wired connections are ready at ASSOCIATED not COMPLETED FS#20150 + report_debug wpa_cli -p "$WPA_CTRL_PATH" -i "$INTERFACE" status while [[ $timeout -lt "$TIMEOUT" ]]; do ( # Sometimes wpa_supplicant isn't ready so silence errors for 2s only to avoid hiding real errors if [[ $timeout -lt 2 ]]; then @@ -97,6 +96,7 @@ wpa_supplicant_scan_and_find() { # item = string to lookup local INTERFACE="$1" FIELD="$2" ITEM="$3" RETRIES=5 try scan_ok scan_ok=0 + report_debug wpa_cli -p "$WPA_CTRL_PATH" -i "$INTERFACE" scan wpa_cli -p "$WPA_CTRL_PATH" -i "$INTERFACE" scan &> /dev/null for ((try=0; try < $RETRIES; try++)); do local found |