# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1215691756 0
# Node ID b8b2e39066ea122ea7f87aade301cc31b9cc9eb2
# Parent  de5ae88515f686d3099321b53c983c4a332ebede
network.sh: enhance wifi setup

diff -r de5ae88515f6 -r b8b2e39066ea etc/init.d/network.sh
--- a/etc/init.d/network.sh	Thu Jun 26 22:08:18 2008 +0200
+++ b/etc/init.d/network.sh	Thu Jul 10 12:09:16 2008 +0000
@@ -16,6 +16,64 @@
 /sbin/route add 127.0.0.1 lo
 status
 
+# For wifi. Users just have to enable it throught yes and usually
+# essid any will work and interface is autodetected.
+if [ "$WIFI" = "yes" ] || grep -q "wifi" /proc/cmdline; then
+	if [ -n "$NDISWRAPPER_DRIVERS" -a -x /usr/sbin/ndiswrapper ]; then
+		for i in $NDISWRAPPER_DRIVERS; do
+			ndiswrapper -i $i
+		done
+		modprobe ndiswrapper
+	fi
+	if ! iwconfig $WIFI_INTERFACE 2>&1 | grep -iq "essid"; then
+		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 "essid"; then
+		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
+network={
+	ssid="$WIFI_ESSID"
+	scan_ssid=1
+	proto=WPA
+	key_mgmt=WPA-PSK
+	psk="$WIFI_KEY"
+	priority=5
+}
+EOF
+			wpa_supplicant -B -w -c/tmp/wpa.conf -D$DRIVER -i$WIFI_INTERFACE
+			;;
+		any|ANY) cat > /tmp/wpa.conf <<EOF
+ap_scan=1
+network={
+	ssid="$WIFI_ESSID"
+	scan_ssid=1
+	key_mgmt=WPA-EAP WPA-PSK IEEE8021X NONE
+	group=CCMP TKIP WEP104 WEP40
+	pairwise=CCMP TKIP
+	psk="$WIFI_KEY"
+	priority=5
+}
+EOF
+			wpa_supplicant -B -w -c/tmp/wpa.conf -D$WPA_DRIVER -i$WIFI_INTERFACE
+			;;
+		esac
+		[ -n "$WIFI_CHANNEL" ] && IWCONFIG_ARGS="$IWCONFIG_ARGS channel $WIFI_CHANNEL"
+		ifconfig $WIFI_INTERFACE up
+		iwconfig $WIFI_INTERFACE txpower on
+		iwconfig $WIFI_INTERFACE essid $WIFI_ESSID $IWCONFIG_ARGS
+		INTERFACE=$WIFI_INTERFACE
+        fi
+fi
+
 # For a dynamic IP with DHCP.
 if [ "$DHCP" = "yes" ] ; then
 	echo "Starting udhcpc client on: $INTERFACE... "
@@ -34,23 +92,3 @@
 		echo "nameserver $NS" >> /etc/resolv.conf
 	done
 fi
-
-# For wifi. Users just have to enable it throught yes and usually
-# essid any will work and interafce is wlan0.
-if [ "$WIFI" = "yes" ] || grep -q "wifi" /proc/cmdline; then
-	if [ -n "$NDISWRAPPER_DRIVERS" -a -x /usr/sbin/ndiswrapper ]; then
-		for i in $NDISWRAPPER_DRIVERS; do
-			ndiswrapper -i $i
-		done
-		modprobe ndiswrapper
-	fi
-	IWCONFIG_ARGS=""
-	[ -n "$WIFI_MODE" ] && IWCONFIG_ARGS="$IWCONFIG_ARGS mode $WIFI_MODE"
-	[ -n "$WIFI_KEY" ] && IWCONFIG_ARGS="$IWCONFIG_ARGS key $WIFI_KEY"
-	[ -n "$WIFI_CHANNEL" ] && IWCONFIG_ARGS="$IWCONFIG_ARGS channel $WIFI_CHANNEL"
-	ifconfig $WIFI_INTERFACE up
-	iwconfig $WIFI_INTERFACE essid $WIFI_ESSID $IWCONFIG_ARGS
-	echo "Starting udhcpc client on: $WIFI_INTERFACE... "
-	/sbin/udhcpc -b -i $WIFI_INTERFACE \
-		-p /var/run/udhcpc.$WIFI_INTERFACE.pid
-fi
diff -r de5ae88515f6 -r b8b2e39066ea etc/network.conf
--- a/etc/network.conf	Thu Jun 26 22:08:18 2008 +0200
+++ b/etc/network.conf	Thu Jul 10 12:09:16 2008 +0000
@@ -32,5 +32,6 @@
 WIFI_ESSID="any"
 WIFI_MODE="managed"
 WIFI_KEY=""
+WIFI_KEY_TYPE="none"
 WIFI_CHANNEL=""
 NDISWRAPPER_DRIVERS=""