[oe-commits] John Lee : fastboot: wireless-tools: make it stock script as suggested by Koen.

[GIT User account]

Module: openembedded.git
Branch: john_lee/fastboot-devel
Commit: 1af23ce83bc49615f305aca8eadc4e74d6ff8620
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=1af23ce83bc49615f305aca8eadc4e74d6ff8620

Author: John Lee <john_lee at openmoko.org>
Date:   Tue Dec 23 21:22:18 2008 +0800

fastboot: wireless-tools: make it stock script as suggested by Koen.

---

 .../wireless-tools/openmoko/zzz-wireless.if-pre-up |   34 --------------------
 .../wireless-tools/zzz-wireless.if-pre-up          |    4 +-
 2 files changed, 2 insertions(+), 36 deletions(-)

diff --git a/packages/wireless-tools/wireless-tools/openmoko/zzz-wireless.if-pre-up b/packages/wireless-tools/wireless-tools/openmoko/zzz-wireless.if-pre-up
deleted file mode 100644
index 85fcc87..0000000
--- a/packages/wireless-tools/wireless-tools/openmoko/zzz-wireless.if-pre-up
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-#
-# /etc/network/if-pre-up.d/zzz-wireless
-# by Stefan Tomanek (stefan at pico.ruhr.de)
-
-
-IWCONFIG=/sbin/iwconfig
-IFCONFIG=/sbin/ifconfig
-GREP=/bin/grep
-LOGGER=/usr/bin/logger
-SLEEP=/bin/sleep
-
-# How long do we wait for association?
-RETRIES=15
-SLEEPTIME=1
-
-# Only sleep if we use DHCP (add others methods seperated by spaces)
-ONLY_FOR="dhcp"
-
-if [ -z "$IF_WIRELESS_TYPE" ] && echo "$ONLY_FOR" | grep -q "$METHOD" ; then
-	$IFCONFIG $IFACE up
-	$LOGGER Checking for WLAN association...
-	while ( [ $RETRIES -gt 0 ] && ($IWCONFIG "$IFACE" | $GREP -q "Access Point: Not-Associated") ); do
-		$LOGGER No association yet, $RETRIES retries until timeout
-		RETRIES=$(($RETRIES-1))
-		$SLEEP $SLEEPTIME
-	done
-
-	if [ $RETRIES -eq 0 ]; then
-		$LOGGER Timeout waiting for association, continuing anyway...
-	else
-		$LOGGER Found association!
-	fi
-fi
diff --git a/packages/wireless-tools/wireless-tools/zzz-wireless.if-pre-up b/packages/wireless-tools/wireless-tools/zzz-wireless.if-pre-up
index 4c8e95b..85fcc87 100644
--- a/packages/wireless-tools/wireless-tools/zzz-wireless.if-pre-up
+++ b/packages/wireless-tools/wireless-tools/zzz-wireless.if-pre-up
@@ -15,7 +15,7 @@ RETRIES=15
 SLEEPTIME=1
 
 # Only sleep if we use DHCP (add others methods seperated by spaces)
-ONLY_FOR="static dhcp"
+ONLY_FOR="dhcp"
 
 if [ -z "$IF_WIRELESS_TYPE" ] && echo "$ONLY_FOR" | grep -q "$METHOD" ; then
 	$IFCONFIG $IFACE up
@@ -25,7 +25,7 @@ if [ -z "$IF_WIRELESS_TYPE" ] && echo "$ONLY_FOR" | grep -q "$METHOD" ; then
 		RETRIES=$(($RETRIES-1))
 		$SLEEP $SLEEPTIME
 	done
-	
+
 	if [ $RETRIES -eq 0 ]; then
 		$LOGGER Timeout waiting for association, continuing anyway...
 	else