summaryrefslogtreecommitdiffstats
path: root/src/connections/wireless
diff options
context:
space:
mode:
authorJouke Witteveen <j.witteveen@gmail.com>2012-07-03 13:25:05 +0200
committerJouke Witteveen <j.witteveen@gmail.com>2012-07-03 13:25:05 +0200
commitc2036ac1ab643040d6cf98e682ed171114d87090 (patch)
tree76c4d5f7281b1b4172e67f08b029ab0f4e5c561a /src/connections/wireless
parentca3e0f60d834d1d9fa57440c134a5ca4332ba394 (diff)
downloadnetctl-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/connections/wireless')
-rw-r--r--src/connections/wireless2
1 files changed, 1 insertions, 1 deletions
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)