[pkg-wpa-devel] r901 - in /wpasupplicant/trunk/debian: changelog ifupdown/ifupdown.sh

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Thu Nov 22 07:11:36 2007
New Revision: 901

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=901
Log:
* Adjust logic when using sed to determine ctrl_interface socket directory
  from the configfile to handle ctrl_interface=DIR= GROUP= syntax.

Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/ifupdown/ifupdown.sh

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=901&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Thu Nov 22 07:11:36 2007
@@ -31,8 +31,10 @@
   * wpa_action: check status with respect to ifupdown after CONNECTED event
     has ensued. If the interface is not recorded in ifupdown's state file
     attempt reassociation. (Closes: #428304).
-
- -- Kel Modderman <kel at otaku42.de>  Mon, 19 Nov 2007 20:57:16 +1000
+  * Adjust logic when using sed to determine ctrl_interface socket directory
+    from the configfile to handle ctrl_interface=DIR= GROUP= syntax.
+
+ -- Kel Modderman <kel at otaku42.de>  Thu, 22 Nov 2007 17:10:29 +1000
 
 wpasupplicant (0.6.0-4) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/ifupdown/ifupdown.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/ifupdown.sh?rev=901&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/ifupdown.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/ifupdown.sh Thu Nov 22 07:11:36 2007
@@ -76,8 +76,8 @@
 		wpa_msg stderr "cannot read contents of $IF_WPA_CONF"
 		exit 1
 	fi	
-	WPA_SUP_CONF_CTRL_DIR=$(sed --quiet \
-		's/[[:space:]]*#.*//g;s/[[:space:]]\+.*$//g;s/^\(ctrl_interface\|DIR\)=\(.*\)/\2/p' "$IF_WPA_CONF")
+	WPA_SUP_CONF_CTRL_DIR=$(sed --quiet -e 's/[[:space:]]*#.*//g' -e 's/[[:space:]]\+.*$//g' \
+		-e 's/^ctrl_interface=\(DIR=\)\?\(.*\)/\2/p' "$IF_WPA_CONF")
 	if [ -n "$WPA_SUP_CONF_CTRL_DIR" ]; then
 		WPA_CTRL_DIR="$WPA_SUP_CONF_CTRL_DIR"
 	fi