SliTaz Repositories

     1.1 --- a/etc/init.d/network.sh	Tue Aug 05 08:45:37 2008 +0000
     1.2 +++ b/etc/init.d/network.sh	Fri Sep 19 08:38:26 2008 +0000
     1.3 @@ -54,15 +54,14 @@
     1.4  			echo "$WIFI_INTERFACE is not a wifi interface, changing it."
     1.5  			WIFI_INTERFACE=$(grep : /proc/net/dev | cut -d: -f1 | \
     1.6  				while read dev; do iwconfig $dev 2>&1 | \
     1.7 -				grep -iq "essid" && { echo $dev ; break; }; \
     1.8 -							done)
     1.9 -					[ -n "$WIFI_INTERFACE" ] && sed -i "s/^WIFI_INTERFACE=.*/WIFI_INTERFACE=\"$WIFI_INTERFACE\"/" /etc/network.conf
    1.10 -			fi
    1.11 -			[ -n "$WPA_DRIVER" ] || WPA_DRIVER="wext"
    1.12 -			if iwconfig $WIFI_INTERFACE 2>&1 | grep -iq "unassociated"; then
    1.13 -			IWCONFIG_ARGS=""
    1.14 -			[ -n "$WIFI_MODE" ] && IWCONFIG_ARGS="$IWCONFIG_ARGS mode $WIFI_MODE"
    1.15 -			[ -n "$WIFI_KEY" ] && case "$WIFI_KEY_TYPE" in
    1.16 +					grep -iq "essid" && { echo $dev ; break; }; \
    1.17 +				done)
    1.18 +			[ -n "$WIFI_INTERFACE" ] && sed -i "s/^WIFI_INTERFACE=.*/WIFI_INTERFACE=\"$WIFI_INTERFACE\"/" /etc/network.conf
    1.19 +		fi
    1.20 +		[ -n "$WPA_DRIVER" ] || WPA_DRIVER="wext"
    1.21 +		IWCONFIG_ARGS=""
    1.22 +		[ -n "$WIFI_MODE" ] && IWCONFIG_ARGS="$IWCONFIG_ARGS mode $WIFI_MODE"
    1.23 +		[ -n "$WIFI_KEY" ] && case "$WIFI_KEY_TYPE" in
    1.24  			wep|WEP) IWCONFIG_ARGS="$IWCONFIG_ARGS key $WIFI_KEY";;
    1.25  			wpa|WPA) cat > /tmp/wpa.conf <<EOF
    1.26  ap_scan=1
    1.27 @@ -93,16 +92,15 @@
    1.28  				echo "starting wpa_supplicant for any key type"
    1.29  				wpa_supplicant -B -w -c/tmp/wpa.conf -D$WPA_DRIVER -i$WIFI_INTERFACE
    1.30  				;;
    1.31 -			esac
    1.32 -			rm -f /tmp/wpa.conf
    1.33 -			[ -n "$WIFI_CHANNEL" ] && IWCONFIG_ARGS="$IWCONFIG_ARGS channel $WIFI_CHANNEL"
    1.34 -			echo -n "configuring $WIFI_INTERFACE..."
    1.35 -			ifconfig $WIFI_INTERFACE up
    1.36 -			iwconfig $WIFI_INTERFACE txpower on
    1.37 -			iwconfig $WIFI_INTERFACE essid $WIFI_ESSID $IWCONFIG_ARGS
    1.38 -			status
    1.39 -			INTERFACE=$WIFI_INTERFACE
    1.40 -			fi
    1.41 +		esac
    1.42 +		rm -f /tmp/wpa.conf
    1.43 +		[ -n "$WIFI_CHANNEL" ] && IWCONFIG_ARGS="$IWCONFIG_ARGS channel $WIFI_CHANNEL"
    1.44 +		echo -n "configuring $WIFI_INTERFACE..."
    1.45 +		ifconfig $WIFI_INTERFACE up
    1.46 +		iwconfig $WIFI_INTERFACE txpower on
    1.47 +		iwconfig $WIFI_INTERFACE essid $WIFI_ESSID $IWCONFIG_ARGS
    1.48 +		status
    1.49 +		INTERFACE=$WIFI_INTERFACE
    1.50  	fi
    1.51  
    1.52  	# For a dynamic IP with DHCP.