diff options
| author | Rémy Oudompheng <remy@archlinux.org> | 2011-08-09 00:27:53 +0200 |
|---|---|---|
| committer | Rémy Oudompheng <remy@archlinux.org> | 2011-08-09 00:27:53 +0200 |
| commit | 8dec3ca378062e538dd97eba1712338bbebc8f33 (patch) | |
| tree | 3791de47b4d5411b6989b71894b3221222a24f11 /src/connections | |
| parent | 82561d179d239bd7c3305e81fa62f01928fb390e (diff) | |
| parent | 0b6ac7bf41ef2f1cf548eda8a4054c21a4bd9434 (diff) | |
| download | netctl-8dec3ca378062e538dd97eba1712338bbebc8f33.tar.gz netctl-8dec3ca378062e538dd97eba1712338bbebc8f33.tar.xz | |
Merge branch '2.6.x'
Conflicts:
README
Diffstat (limited to 'src/connections')
| -rw-r--r-- | src/connections/wireless | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/connections/wireless b/src/connections/wireless index 7f95c6f..7ed5abe 100644 --- a/src/connections/wireless +++ b/src/connections/wireless @@ -26,8 +26,13 @@ wireless_up() { stop_wpa "$INTERFACE" # Start wpa_supplicant + WPA_CTRL_PATH=/run/wpa_supplicant if [ "$SECURITY" = "wpa-config" ]; then WPA_CONF="${WPA_CONF:-/etc/wpa_supplicant.conf}" + # Use defined control path (FS#24949) + if grep "ctrl_interface=" "$WPA_CONF" &>/dev/null; then + WPA_CTRL_PATH=$(grep -m 1 "^ctrl_interface=" "$WPA_CONF" | tail -n 1 | cut -d= -f 2- | sed -r 's/DIR=(.*) +GROUP=.*/\1/') + fi else WPA_CONF=$(make_wpa_config_file $INTERFACE) fi |