From c2036ac1ab643040d6cf98e682ed171114d87090 Mon Sep 17 00:00:00 2001
From: Jouke Witteveen <j.witteveen@gmail.com>
Date: Tue, 3 Jul 2012 13:25:05 +0200
Subject: Changes needed after b0373

The reverted state wasn't entirely compatible with the current code.
The WPA_CTRL_PATH handling throughout netcfg is ugly.
---
 src/connections/wireless | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/connections/wireless')

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)
-- 
cgit v1.2.3-24-g4f1b