# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1221813506 0
# Node ID 6d7cab1978a8e5b780b81638d5d6eabfe56f682d
# Parent  17c69f17fb524cf3b13c9181ba9fd188d6ebb774
network.sh: ensure iwconfig for start

diff -r 17c69f17fb52 -r 6d7cab1978a8 etc/init.d/network.sh
--- a/etc/init.d/network.sh	Tue Aug 05 08:45:37 2008 +0000
+++ b/etc/init.d/network.sh	Fri Sep 19 08:38:26 2008 +0000
@@ -54,15 +54,14 @@
 			echo "$WIFI_INTERFACE is not a wifi interface, changing it."
 			WIFI_INTERFACE=$(grep : /proc/net/dev | cut -d: -f1 | \
 				while read dev; do iwconfig $dev 2>&1 | \
-				grep -iq "essid" && { echo $dev ; break; }; \
-							done)
-					[ -n "$WIFI_INTERFACE" ] && sed -i "s/^WIFI_INTERFACE=.*/WIFI_INTERFACE=\"$WIFI_INTERFACE\"/" /etc/network.conf
-			fi
-			[ -n "$WPA_DRIVER" ] || WPA_DRIVER="wext"
-			if iwconfig $WIFI_INTERFACE 2>&1 | grep -iq "unassociated"; then
-			IWCONFIG_ARGS=""
-			[ -n "$WIFI_MODE" ] && IWCONFIG_ARGS="$IWCONFIG_ARGS mode $WIFI_MODE"
-			[ -n "$WIFI_KEY" ] && case "$WIFI_KEY_TYPE" in
+					grep -iq "essid" && { echo $dev ; break; }; \
+				done)
+			[ -n "$WIFI_INTERFACE" ] && sed -i "s/^WIFI_INTERFACE=.*/WIFI_INTERFACE=\"$WIFI_INTERFACE\"/" /etc/network.conf
+		fi
+		[ -n "$WPA_DRIVER" ] || WPA_DRIVER="wext"
+		IWCONFIG_ARGS=""
+		[ -n "$WIFI_MODE" ] && IWCONFIG_ARGS="$IWCONFIG_ARGS mode $WIFI_MODE"
+		[ -n "$WIFI_KEY" ] && case "$WIFI_KEY_TYPE" in
 			wep|WEP) IWCONFIG_ARGS="$IWCONFIG_ARGS key $WIFI_KEY";;
 			wpa|WPA) cat > /tmp/wpa.conf <<EOF
 ap_scan=1
@@ -93,16 +92,15 @@
 				echo "starting wpa_supplicant for any key type"
 				wpa_supplicant -B -w -c/tmp/wpa.conf -D$WPA_DRIVER -i$WIFI_INTERFACE
 				;;
-			esac
-			rm -f /tmp/wpa.conf
-			[ -n "$WIFI_CHANNEL" ] && IWCONFIG_ARGS="$IWCONFIG_ARGS channel $WIFI_CHANNEL"
-			echo -n "configuring $WIFI_INTERFACE..."
-			ifconfig $WIFI_INTERFACE up
-			iwconfig $WIFI_INTERFACE txpower on
-			iwconfig $WIFI_INTERFACE essid $WIFI_ESSID $IWCONFIG_ARGS
-			status
-			INTERFACE=$WIFI_INTERFACE
-			fi
+		esac
+		rm -f /tmp/wpa.conf
+		[ -n "$WIFI_CHANNEL" ] && IWCONFIG_ARGS="$IWCONFIG_ARGS channel $WIFI_CHANNEL"
+		echo -n "configuring $WIFI_INTERFACE..."
+		ifconfig $WIFI_INTERFACE up
+		iwconfig $WIFI_INTERFACE txpower on
+		iwconfig $WIFI_INTERFACE essid $WIFI_ESSID $IWCONFIG_ARGS
+		status
+		INTERFACE=$WIFI_INTERFACE
 	fi
 
 	# For a dynamic IP with DHCP.