SliTaz Repositories

     1.1 --- a/etc/init.d/network.sh	Tue Mar 23 21:48:17 2010 +0100
     1.2 +++ b/etc/init.d/network.sh	Thu Mar 25 19:20:50 2010 +0000
     1.3 @@ -59,11 +59,12 @@
     1.4  		IWCONFIG_ARGS=""
     1.5  		[ -n "$WIFI_MODE" ] && IWCONFIG_ARGS="$IWCONFIG_ARGS mode $WIFI_MODE"
     1.6  		[ -n "$WIFI_CHANNEL" ] && IWCONFIG_ARGS="$IWCONFIG_ARGS channel $WIFI_CHANNEL"
     1.7 -		
     1.8 -		if [ "$WIFI_KEY_TYPE" == "" ]; then
     1.9 +		# unencrypted network
    1.10 +		if [ "$WIFI_KEY" == "" -o "$WIFI_KEY_TYPE" == "none" ]; 
    1.11 +then
    1.12  			iwconfig $WIFI_INTERFACE essid "$WIFI_ESSID" $IWCONFIG_ARGS
    1.13  		fi
    1.14 -		
    1.15 +		# encrypted network
    1.16  		[ -n "$WIFI_KEY" ] && case "$WIFI_KEY_TYPE" in
    1.17  			wep|WEP) 
    1.18  			     IWCONFIG_ARGS="$IWCONFIG_ARGS key $WIFI_KEY"
    1.19 @@ -84,6 +85,8 @@
    1.20  #	priority=5
    1.21  #}
    1.22  #EOF
    1.23 +#				echo "Starting wpa_supplicant for NONE/WEP..."
    1.24 +#				wpa_supplicant -B -W -c/tmp/wpa.conf -D$WPA_DRIVER -i$WIFI_INTERFACE 
    1.25  				    ;;
    1.26  			wpa|WPA) cat /etc/wpa_supplicant.conf > /tmp/wpa.conf # load pre-configured multiple profiles 
    1.27  			cat >> /tmp/wpa.conf <<EOF
    1.28 @@ -124,7 +127,8 @@
    1.29  		
    1.30  		rm -f /tmp/wpa.conf
    1.31  		
    1.32 -		INTERFACE=$WIFI_INTERFACE			
    1.33 +		INTERFACE=$WIFI_INTERFACE	
    1.34 +		 		
    1.35  	fi
    1.36  
    1.37  }
    1.38 @@ -155,8 +159,8 @@
    1.39  		echo "Configuring static IP on $INTERFACE: $IP..."
    1.40  		/sbin/ifconfig $INTERFACE $IP netmask $NETMASK up
    1.41  		/sbin/route add default gateway $GATEWAY
    1.42 -		# Dirty trick: wpa_supplicant waits for wpa_cli
    1.43 -		wpa_cli -B
    1.44 +		# wpa_supplicant waits for wpa_cli
    1.45 +		[ -d /var/run/wpa_supplicant ] && wpa_cli -B
    1.46  		# Multi-DNS server in $DNS_SERVER.
    1.47  		/bin/mv /etc/resolv.conf /tmp/resolv.conf.$$
    1.48  		for NS in $DNS_SERVER
    1.49 @@ -186,7 +190,9 @@
    1.50     eth
    1.51     wifi
    1.52     dhcp 
    1.53 -   static_ip	
    1.54 +   static_ip
    1.55 +   # change default lxpanel panel iface
    1.56 +	sed -i "s/iface=.*/iface=$INTERFACE/" /etc/lxpanel/default/panels/panel	
    1.57  }
    1.58  
    1.59