Author: arekm
Date: Tue May 18 14:13:13 2010
New Revision: 11476
Modified:
rc-scripts/trunk/sysconfig/network-scripts/ifup
Log:
No need for wait loop. check_link_down sleeps for specified time in 0.5s
intervals.
Modified: rc-scripts/trunk/sysconfig/network-scripts/ifup
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/ifup (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/ifup Tue May 18 14:13:13 2010
@@ -123,16 +123,10 @@
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
+ [ -z "$WLAN_WPA_WAIT_TIMEOUT" ] && WLAN_WPA_WAIT_TIMEOUT=15
+ # check_link_down sleeps for 0.5s
+ check_link_down ${DEVICE} $(( $WLAN_WPA_WAIT_TIMEOUT * 2 ))
fi
if [ "$HANDLING" = "2" ]; then
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
