# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1210883164 0
# Node ID 1127ecb2b484e5f95b55e8cb98cf1d4f63996666
# Parent  17460a2694e6d80d70450bef2894c851b30ab1c1
network: some iwconfig parameters

diff -r 17460a2694e6 -r 1127ecb2b484 etc/init.d/network.sh
--- a/etc/init.d/network.sh	Thu May 15 21:49:07 2008 +0200
+++ b/etc/init.d/network.sh	Thu May 15 20:26:04 2008 +0000
@@ -38,7 +38,12 @@
 # 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
-	iwconfig $WIFI_INTERFACE essid $ESSID
+	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
diff -r 17460a2694e6 -r 1127ecb2b484 etc/network.conf
--- a/etc/network.conf	Thu May 15 21:49:07 2008 +0200
+++ b/etc/network.conf	Thu May 15 20:26:04 2008 +0000
@@ -29,4 +29,7 @@
 
 # Wifi interface (iwconfig) and ESSID.
 WIFI_INTERFACE="wlan0"
-ESSID="any"
+WIFI_ESSID="any"
+WIFI_MODE="managed"
+WIFI_KEY=""
+WIFI_CHANNEL=""