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

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

Author: kelmo-guest
Date: Mon Jun 11 02:02:56 2007
New Revision: 850

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=850
Log:
* Damage control: allow 'wpa-conf managed' to pass through without failure
  for those people who followed the poor example outlined in the hidden
  ssid's section of README.modes. Also remove the offending line from the
  documentaion. (Closes: #428137)

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

Modified: wpasupplicant/trunk/debian/README.modes
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/README.modes?rev=850&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/README.modes (original)
+++ wpasupplicant/trunk/debian/README.modes Mon Jun 11 02:02:56 2007
@@ -496,7 +496,6 @@
 If you are using the managed mode, you can do so by these stanzas:
 
 iface eth1 inet dhcp
-	wpa-conf managed
 	wpa-ap-scan 1
 	wpa-scan-ssid 1
 	# ... additional options for your setup

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=850&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Mon Jun 11 02:02:56 2007
@@ -14,8 +14,12 @@
   * Add WPADIR variable to debian/rules, adjust build and install targets to
     use WPADIR.
   * Update madwifi_headers patch with code from current madwifi SVN trunk.
-
- -- Kel Modderman <kel at otaku42.de>  Fri, 01 Jun 2007 23:11:51 +1000
+  * Damage control: allow 'wpa-conf managed' to pass through without failure
+    for those people who followed the poor example outlined in the hidden
+    ssid's section of README.modes. Also remove the offending line from the
+    documentaion. (Closes: #428137)
+
+ -- Kel Modderman <kel at otaku42.de>  Mon, 11 Jun 2007 11:59:56 +1000
 
 wpasupplicant (0.6.0~cvs20070224-3) 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=850&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/ifupdown.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/ifupdown.sh Mon Jun 11 02:02:56 2007
@@ -73,6 +73,10 @@
 # master function; determines if ifupdown.sh should do something or not
 if [ -n "$IF_WPA_CONF" ]; 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