[pkg-wpa-devel] r1260 - in /wpasupplicant/trunk/debian: changelog ifupdown/functions.sh
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Wed Oct 1 17:34:00 UTC 2008
Author: kelmo-guest
Date: Wed Oct 1 17:34:00 2008
New Revision: 1260
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1260
Log:
When using wpa-roam and connecting to an interface for which an id_str
is defined but no matching /e/n/i logical interfaces has been configured,
try to configure the default logical interface.
Modified:
wpasupplicant/trunk/debian/changelog
wpasupplicant/trunk/debian/ifupdown/functions.sh
Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1260&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Wed Oct 1 17:34:00 2008
@@ -1,4 +1,4 @@
-wpasupplicant (0.6.4-4) experimental; urgency=low
+wpasupplicant (0.6.4-4~kelmo1) experimental; urgency=low
* Add 17_handle_last_window_closed.patch to improve application exit
handling of wpa_gui-qt4, so that event history and scan results windows
@@ -14,8 +14,11 @@
* Modify 20_wpa_gui_menu_exec_path.patch to use the new -t command line
option and start wpa_gui in the system tray and avoid desktop startup
notifications.
-
- -- Kel Modderman <kel at otaku42.de> Wed, 01 Oct 2008 11:55:37 +1000
+ * When using wpa-roam and connecting to an interface for which an id_str
+ is defined but no matching /e/n/i logical interfaces has been configured,
+ try to configure the default logical interface.
+
+ -- Kel Modderman <kel at otaku42.de> Thu, 02 Oct 2008 03:31:19 +1000
wpasupplicant (0.6.4-3) experimental; urgency=low
Modified: wpasupplicant/trunk/debian/ifupdown/functions.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/functions.sh?rev=1260&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/functions.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/functions.sh Wed Oct 1 17:34:00 2008
@@ -1013,22 +1013,25 @@
if [ -n "$WPA_LOGICAL_IFACE" ]; then
if egrep -q "^iface[[:space:]]+${WPA_LOGICAL_IFACE}[[:space:]]+inet" "$INTERFACES_FILE"; then
-
- echo "ifup $WPA_IFACE=$WPA_LOGICAL_IFACE"
-
- ifupdown_lock
-
- if grep -q "^$WPA_IFACE=$WPA_IFACE" "$IFSTATE_FILE"; then
- # Force settings over the unconfigured "master" IFACE
- /sbin/ifup -v --force "$WPA_IFACE=$WPA_LOGICAL_IFACE"
- else
- /sbin/ifup -v "$WPA_IFACE=$WPA_LOGICAL_IFACE"
- fi
-
- ifupdown_unlock
+ : # logical network is defined
else
echo "No network defined for \"$WPA_LOGICAL_IFACE\" in \"$INTERFACES_FILE\""
- fi
+ echo "Trying to configure the \"default\" network instead ..."
+ WPA_LOGICAL_IFACE="default"
+ fi
+
+ echo "ifup $WPA_IFACE=$WPA_LOGICAL_IFACE"
+
+ ifupdown_lock
+
+ if grep -q "^$WPA_IFACE=$WPA_IFACE" "$IFSTATE_FILE"; then
+ # Force settings over the unconfigured "master" IFACE
+ /sbin/ifup -v --force "$WPA_IFACE=$WPA_LOGICAL_IFACE"
+ else
+ /sbin/ifup -v "$WPA_IFACE=$WPA_LOGICAL_IFACE"
+ fi
+
+ ifupdown_unlock
else
echo "No suitable logical interface mapping for ifupdown to configure"
fi
More information about the Pkg-wpa-devel
mailing list