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

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

Author: kelmo-guest
Date: Wed Jul  4 07:23:25 2007
New Revision: 854

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=854
Log:
* Really allow 'wpa-conf managed' to pass through.

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=854&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Wed Jul  4 07:23:25 2007
@@ -1,3 +1,9 @@
+wpasupplicant (0.6.0-2) unstable; urgency=low
+
+  * Really allow 'wpa-conf managed' to pass through.
+
+ -- Kel Modderman <kel at otaku42.de>  Wed, 04 Jul 2007 17:18:45 +1000
+
 wpasupplicant (0.6.0-1) unstable; urgency=low
 
   [Kel Modderman]

Modified: wpasupplicant/trunk/debian/ifupdown/ifupdown.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/ifupdown.sh?rev=854&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/ifupdown.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/ifupdown.sh Wed Jul  4 07:23:25 2007
@@ -71,12 +71,8 @@
 fi
 
 # master function; determines if ifupdown.sh should do something or not
-if [ -n "$IF_WPA_CONF" ]; then
+if [ -n "$IF_WPA_CONF" ] && [ "$IF_WPA_CONF" != "managed" ]; then
 	if [ ! -s "$IF_WPA_CONF" ]; then
-		# Bugs: #428137 LP:#119415, allow 'wpa-conf managed' to pass through
-		if [ "$IF_WPA_CONF" = "managed" ]; then
-			WPA_SUP_CONF="-C $WPA_CTRL_DIR"
-		fi
 		wpa_msg stderr "cannot read contents of $IF_WPA_CONF"
 		exit 1
 	fi