diff options
| author | Jouke Witteveen <j.witteveen@gmail.com> | 2012-07-03 13:25:05 +0200 |
|---|---|---|
| committer | Jouke Witteveen <j.witteveen@gmail.com> | 2012-07-03 13:25:05 +0200 |
| commit | c2036ac1ab643040d6cf98e682ed171114d87090 (patch) | |
| tree | 76c4d5f7281b1b4172e67f08b029ab0f4e5c561a /src | |
| parent | ca3e0f60d834d1d9fa57440c134a5ca4332ba394 (diff) | |
| download | netctl-c2036ac1ab643040d6cf98e682ed171114d87090.tar.gz netctl-c2036ac1ab643040d6cf98e682ed171114d87090.tar.xz | |
Changes needed after b0373
The reverted state wasn't entirely compatible with the current code.
The WPA_CTRL_PATH handling throughout netcfg is ugly.
Diffstat (limited to 'src')
| -rw-r--r-- | src/8021x | 2 | ||||
| -rw-r--r-- | src/connections/wireless | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -55,7 +55,7 @@ stop_wpa() wpa_reconfigure() { local INTERFACE=$1 - wpa_cli -p "$WPA_CTRL_PATH" -i "$INTERFACE" reconfigure + wpa_cli -p "$WPA_CTRL_PATH" -i "$INTERFACE" reconfigure &> /dev/null return $? } diff --git a/src/connections/wireless b/src/connections/wireless index 143276b..0389ea6 100644 --- a/src/connections/wireless +++ b/src/connections/wireless @@ -8,6 +8,7 @@ wireless_up() { load_profile "$PROFILE" # Default settings + WPA_CTRL_PATH=/run/wpa_supplicant SECURITY=${SECURITY:-none} WPA_DRIVER=${WPA_DRIVER:-nl80211,wext} @@ -21,7 +22,6 @@ 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) |