diff --git a/iopsys-ramips/base-files/sbin/wifi b/iopsys-ramips/base-files/sbin/wifi index 6c192d69c8fea6193fc88a2cda40fe9863d63280..258f0e57b52662196a27e23de7cee6f6f40a13dd 100755 --- a/iopsys-ramips/base-files/sbin/wifi +++ b/iopsys-ramips/base-files/sbin/wifi @@ -10,6 +10,8 @@ local _ACTION=$1 local _VIFNUM=0 local _REPEATER=0 local _DAT=1 +local _AUTH="" +local _ENCR="" RA="/etc/Wireless/RT2860/RT2860.dat" RAI="/etc/Wireless/iNIC/iNIC_ap.dat" @@ -111,6 +113,9 @@ vif_settings() { ;; esac + [ -n "$_AUTH" ] && _AUTH="$_AUTH;$authmode" || _AUTH=$authmode + [ -n "$_ENCR" ] && _ENCR="$_ENCR;$encrtype" || _ENCR=$encrtype + config_get macfilter $cfg macfilter "0" case $macfilter in 1) macmode=2 ;; @@ -154,8 +159,8 @@ vif_settings() { if [ $_DAT == 1 ]; then sed -i "s/ApCliEnable=.*/ApCliEnable=0/g" $CONFILE - sed -i "s/AuthMode=.*/AuthMode=$authmode/g" $CONFILE - sed -i "s/EncrypType=.*/EncrypType=$encrtype/g" $CONFILE + sed -i "s/AuthMode=.*/AuthMode=$_AUTH/g" $CONFILE + sed -i "s/EncrypType=.*/EncrypType=$_ENCR/g" $CONFILE sed -i "s/SSID$VNO=.*/SSID$VNO=$ssid/g" $CONFILE sed -i "s/WPAPSK$VNO=.*/WPAPSK$VNO=$wpapsk/g" $CONFILE @@ -337,6 +342,8 @@ setup_wifi_device() { config_foreach configure_vif wifi-iface "$device" wdev_settings $device _VIFNUM=0 + _AUTH="" + _ENCR="" } configure_wifi() {