SVN: rc-scripts/trunk/sysconfig: interfaces/ifcfg-description network-scripts/ifup

[arekm]

Author: arekm
Date: Mon May 17 22:26:19 2010
New Revision: 11475

Modified:
   rc-scripts/trunk/sysconfig/interfaces/ifcfg-description
   rc-scripts/trunk/sysconfig/network-scripts/ifup
Log:
Wait for wpa_supplicant to actually connect to network before trying dhcp.

Modified: rc-scripts/trunk/sysconfig/interfaces/ifcfg-description
==============================================================================
--- rc-scripts/trunk/sysconfig/interfaces/ifcfg-description	(original)
+++ rc-scripts/trunk/sysconfig/interfaces/ifcfg-description	Mon May 17 22:26:19 2010
@@ -121,6 +121,7 @@
 		WLAN_RETRY=limit <value>|lifetime <value>
 		WLAN_COMMIT=yes|no (some cards require manual commit of changes)
 		if WLAN_WPA=yes; then
+			WLAN_WPA_WAIT_TIMEOUT=<wait max x sec for wpa_suplicant>
 			WLAN_WPA_DRIVER=<driver: see -D option of wpa_supplicant; default is wext>
 			WLAN_WPA_CONFIG=<path to wpa_supplicant config file>
 			WLAN_WPA_OPTIONS=[additional wpa_supplicant options]

Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup	(original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup	Mon May 17 22:26:19 2010
@@ -123,7 +123,16 @@
 fi
 
 if is_yes "${WLAN_WPA}"; then
+	[ -z "$WLAN_WPA_WAIT_TIMEOUT" ] && WLAN_WPA_WAIT_TIMEOUT=15
 	/usr/sbin/wpa_supplicant -D ${WLAN_WPA_DRIVER:-wext} -c ${WLAN_WPA_CONFIG:-/etc/wpa_supplicant.conf} -i ${DEVICE} ${WLAN_WPA_OPTIONS} -P "/var/run/wpa_supplicant-${DEVICE}.pid" -B
+	i=0
+	while [ "$i" -lt "$WLAN_WPA_WAIT_TIMEOUT" ]; do
+		i=$((i + 1))
+		# check_link_down sleeps for 0.5s
+		check_link_down ${DEVICE} 2
+		status=$?
+		[ "$status" = "1" ] && break
+	done
 fi
 
 if [ "$HANDLING" = "2" ]; then