slitaz-boot-scripts rev 340
network.sh: mini clean-up
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Wed Jan 22 17:10:32 2014 +0100 (2014-01-22) |
parents | f2a23e182b9b |
children | ee519cf99dd6 |
files | etc/init.d/network.sh |
line diff
1.1 --- a/etc/init.d/network.sh Wed Jan 15 08:27:22 2014 +0100 1.2 +++ b/etc/init.d/network.sh Wed Jan 22 17:10:32 2014 +0100 1.3 @@ -96,6 +96,7 @@ 1.4 echo "Starting wpa_supplicant for NONE/WEP..." 1.5 wpa_supplicant -B -W -c/tmp/wpa.conf -D$WPA_DRIVER \ 1.6 -i$WIFI_INTERFACE ;; 1.7 + 1.8 wpa|WPA) 1.9 # load pre-configured multiple profiles 1.10 cat /etc/wpa_supplicant.conf > /tmp/wpa.conf 1.11 @@ -115,6 +116,7 @@ 1.12 echo "Starting wpa_supplicant for WPA-PSK..." 1.13 wpa_supplicant -B -W -c/tmp/wpa.conf \ 1.14 -D$WPA_DRIVER -i$WIFI_INTERFACE ;; 1.15 + 1.16 any|ANY) cat /etc/wpa_supplicant.conf > /tmp/wpa.conf 1.17 cat >> /tmp/wpa.conf <<EOF 1.18 ctrl_interface=/var/run/wpa_supplicant 1.19 @@ -139,10 +141,9 @@ 1.20 fi 1.21 } 1.22 1.23 -wpa() 1.24 -{ 1.25 - DHCP_SCRIPT="/etc/init.d/wpa_action.sh" 1.26 - wpa_cli -a$DHCP_SCRIPT -B 1.27 +# WPA DHCP script 1.28 +wpa() { 1.29 + wpa_cli -a"/etc/init.d/wpa_action.sh" -B 1.30 } 1.31 1.32 # For a dynamic IP with DHCP.