slitaz-boot-scripts diff etc/init.d/network.sh @ rev 257
rcS: small fix to have tazbox on the correct display
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Fri Apr 29 18:24:31 2011 +0200 (2011-04-29) |
| parents | b6f5f37beaa3 |
| children | 8b16caf41633 |
line diff
1.1 --- a/etc/init.d/network.sh Tue Mar 15 05:57:22 2011 +0100 1.2 +++ b/etc/init.d/network.sh Fri Apr 29 18:24:31 2011 +0200 1.3 @@ -5,9 +5,9 @@ 1.4 . /etc/init.d/rc.functions 1.5 1.6 if [ -z "$2" ]; then 1.7 - . /etc/network.conf 1.8 + . /etc/network.conf 1.9 else 1.10 - . $2 1.11 + . $2 1.12 fi 1.13 1.14 1.15 @@ -21,13 +21,13 @@ 1.16 echo -n "Configuring loopback..." 1.17 /sbin/ifconfig lo 127.0.0.1 up 1.18 /sbin/route add 127.0.0.1 lo 1.19 - status 1.20 + status 1.21 } 1.22 1.23 1.24 eth() { 1.25 # Use ethernet 1.26 - ifconfig $INTERFACE up 1.27 + ifconfig $INTERFACE up 1.28 } 1.29 1.30 wifi() { 1.31 @@ -35,7 +35,7 @@ 1.32 # essid any will work and the interface is autodetected. 1.33 if [ "$WIFI" = "yes" ] || grep -q "wifi" /proc/cmdline; then 1.34 ifconfig $INTERFACE down 1.35 - 1.36 + 1.37 # Confirm if $WIFI_INTERFACE is the wifi interface 1.38 if [ ! -d /sys/class/net/$WIFI_INTERFACE/wireless ]; then 1.39 echo "$WIFI_INTERFACE is not a wifi interface, changing it." 1.40 @@ -45,33 +45,33 @@ 1.41 done) 1.42 [ -n "$WIFI_INTERFACE" ] && sed -i "s/^WIFI_INTERFACE=.*/WIFI_INTERFACE=\"$WIFI_INTERFACE\"/" /etc/network.conf 1.43 fi 1.44 - 1.45 + 1.46 echo -n "Configuring $WIFI_INTERFACE..." 1.47 ifconfig $WIFI_INTERFACE up 1.48 if iwconfig $WIFI_INTERFACE | grep -q "Tx-Power"; then 1.49 iwconfig $WIFI_INTERFACE txpower on 1.50 fi 1.51 status 1.52 - 1.53 + 1.54 [ -n "$WPA_DRIVER" ] || WPA_DRIVER="wext" 1.55 - 1.56 - 1.57 + 1.58 + 1.59 IWCONFIG_ARGS="" 1.60 [ -n "$WIFI_MODE" ] && IWCONFIG_ARGS="$IWCONFIG_ARGS mode $WIFI_MODE" 1.61 [ -n "$WIFI_CHANNEL" ] && IWCONFIG_ARGS="$IWCONFIG_ARGS channel $WIFI_CHANNEL" 1.62 # unencrypted network 1.63 - if [ "$WIFI_KEY" == "" -o "$WIFI_KEY_TYPE" == "none" ]; 1.64 + if [ "$WIFI_KEY" == "" -o "$WIFI_KEY_TYPE" == "none" ]; 1.65 then 1.66 iwconfig $WIFI_INTERFACE essid "$WIFI_ESSID" $IWCONFIG_ARGS 1.67 fi 1.68 # encrypted network 1.69 [ -n "$WIFI_KEY" ] && case "$WIFI_KEY_TYPE" in 1.70 - wep|WEP) 1.71 + wep|WEP) 1.72 IWCONFIG_ARGS="$IWCONFIG_ARGS key $WIFI_KEY" 1.73 iwconfig $WIFI_INTERFACE essid "$WIFI_ESSID" $IWCONFIG_ARGS 1.74 # wpa_supplicant can also deal with wep encryption but iwconfig is preferred 1.75 # Tip: Use unquoted strings for hexadecimal key in wep_key0 1.76 -# cat /etc/wpa_supplicant.conf > /tmp/wpa.conf 1.77 +# cat /etc/wpa_supplicant.conf > /tmp/wpa.conf 1.78 # cat >> /tmp/wpa.conf <<EOF 1.79 #ctrl_interface=/var/run/wpa_supplicant 1.80 #ctrl_interface_group=0 1.81 @@ -86,9 +86,9 @@ 1.82 #} 1.83 #EOF 1.84 # echo "Starting wpa_supplicant for NONE/WEP..." 1.85 -# wpa_supplicant -B -W -c/tmp/wpa.conf -D$WPA_DRIVER -i$WIFI_INTERFACE 1.86 +# wpa_supplicant -B -W -c/tmp/wpa.conf -D$WPA_DRIVER -i$WIFI_INTERFACE 1.87 ;; 1.88 - wpa|WPA) cat /etc/wpa_supplicant.conf > /tmp/wpa.conf # load pre-configured multiple profiles 1.89 + wpa|WPA) cat /etc/wpa_supplicant.conf > /tmp/wpa.conf # load pre-configured multiple profiles 1.90 cat >> /tmp/wpa.conf <<EOF 1.91 ctrl_interface=/var/run/wpa_supplicant 1.92 ctrl_interface_group=0 1.93 @@ -103,9 +103,9 @@ 1.94 } 1.95 EOF 1.96 echo "Starting wpa_supplicant for WPA-PSK..." 1.97 - wpa_supplicant -B -W -c/tmp/wpa.conf -D$WPA_DRIVER -i$WIFI_INTERFACE 1.98 + wpa_supplicant -B -W -c/tmp/wpa.conf -D$WPA_DRIVER -i$WIFI_INTERFACE 1.99 ;; 1.100 - any|ANY) cat /etc/wpa_supplicant.conf > /tmp/wpa.conf 1.101 + any|ANY) cat /etc/wpa_supplicant.conf > /tmp/wpa.conf 1.102 cat >> /tmp/wpa.conf <<EOF 1.103 ctrl_interface=/var/run/wpa_supplicant 1.104 ctrl_interface_group=0 1.105 @@ -121,14 +121,14 @@ 1.106 } 1.107 EOF 1.108 echo "Starting wpa_supplicant for any key type..." 1.109 - wpa_supplicant -B -W -c/tmp/wpa.conf -D$WPA_DRIVER -i$WIFI_INTERFACE 1.110 + wpa_supplicant -B -W -c/tmp/wpa.conf -D$WPA_DRIVER -i$WIFI_INTERFACE 1.111 ;; 1.112 esac 1.113 - 1.114 + 1.115 rm -f /tmp/wpa.conf 1.116 - 1.117 - INTERFACE=$WIFI_INTERFACE 1.118 - 1.119 + 1.120 + INTERFACE=$WIFI_INTERFACE 1.121 + 1.122 fi 1.123 1.124 } 1.125 @@ -136,21 +136,21 @@ 1.126 wpa() 1.127 { 1.128 DHCP_SCRIPT="/etc/init.d/wpa_action.sh" 1.129 - wpa_cli -a$DHCP_SCRIPT -B 1.130 + wpa_cli -a$DHCP_SCRIPT -B 1.131 } 1.132 1.133 dhcp() { 1.134 1.135 -# For a dynamic IP with DHCP. 1.136 +# For a dynamic IP with DHCP. 1.137 if [ "$DHCP" = "yes" ] ; then 1.138 - echo "Starting udhcpc client on: $INTERFACE..." 1.139 + echo "Starting udhcpc client on: $INTERFACE..." 1.140 if [ -d /var/run/wpa_supplicant ] && [ "$WIFI" = "yes" ]; then # wpa wireless && wpa_ctrl_open interface is up 1.141 - wpa 1.142 + wpa 1.143 else # fallback on udhcpc: wep, eth 1.144 /sbin/udhcpc -b -T 1 -A 12 -i $INTERFACE -p /var/run/udhcpc.$INTERFACE.pid 1.145 - fi 1.146 + fi 1.147 fi 1.148 - 1.149 + 1.150 } 1.151 1.152 static_ip() { 1.153 @@ -179,7 +179,7 @@ 1.154 echo "Killing all daemons" 1.155 killall udhcpc 1.156 killall wpa_supplicant 2>/dev/null 1.157 - 1.158 + 1.159 if iwconfig $WIFI_INTERFACE | grep -q "Tx-Power"; then 1.160 echo "Shutting down wifi card" 1.161 iwconfig $WIFI_INTERFACE txpower off 1.162 @@ -189,11 +189,11 @@ 1.163 Start() { 1.164 eth 1.165 wifi 1.166 - dhcp 1.167 + dhcp 1.168 static_ip 1.169 # change default lxpanel panel iface 1.170 [ -f /etc/lxpanel/default/panels/panel ] \ 1.171 - && sed -i "s/iface=.*/iface=$INTERFACE/" /etc/lxpanel/default/panels/panel 1.172 + && sed -i "s/iface=.*/iface=$INTERFACE/" /etc/lxpanel/default/panels/panel 1.173 } 1.174 1.175