small bugfixes

SVN-Revision: 2061

diff --git a/openwrt/package/webif/files/usr/lib/webif/apply.sh b/openwrt/package/webif/files/usr/lib/webif/apply.sh
index 833fa366997c3a7871a05fff64a1ef2f513b1b3e..8253d01245e86faa7d072abd1b26e10ba6ea86f4 100644 (file)
--- a/openwrt/package/webif/files/usr/lib/webif/apply.sh
+++ b/openwrt/package/webif/files/usr/lib/webif/apply.sh
@@ -7,8 +7,8 @@ HANDLERS_config='
        network) reload_network;;
 '
 HANDLERS_file='
-       hosts) rm -f /etc/hosts; mv $config /etc/hosts;;
-       ethers) rm -f /etc/ethers; mv $config /etc/ethers;;
+       hosts) rm -f /etc/hosts; mv $config /etc/hosts; killall -HUP dnsmasq ;;
+       ethers) rm -f /etc/ethers; mv $config /etc/ethers; killall -HUP dnsmasq ;;
 '
 
 reload_network() {

diff --git a/openwrt/package/webif/files/www/cgi-bin/webif/wireless-config.sh b/openwrt/package/webif/files/www/cgi-bin/webif/wireless-config.sh
index d31aa48d8cc7ed3a3f408fe36b36ad31e210d093..e0f8a72022a8e391de2d8f65844f5f0241e4f55d 100755 (executable)
--- a/openwrt/package/webif/files/www/cgi-bin/webif/wireless-config.sh
+++ b/openwrt/package/webif/files/www/cgi-bin/webif/wireless-config.sh
@@ -133,6 +133,7 @@ int|FORM_channel|Channel|required min=1 max=$CHANNEL_MAX|$FORM_channel" && {
                                        wpa1wpa2) save_setting wireless wl0_akm "psk psk2";;
                                esac
                                save_setting wireless wl0_wpa_psk "$FORM_wpa_psk"
+                               save_setting wireless wl0_wep "disabled"
                                ;;
                        wpa)
                                case "${FORM_wpa1}${FORM_wpa2}" in
@@ -142,6 +143,7 @@ int|FORM_channel|Channel|required min=1 max=$CHANNEL_MAX|$FORM_channel" && {
                                esac
                                save_setting wireless wl0_radius_ipaddr "$FORM_radius_ipaddr"
                                save_setting wireless wl0_radius_key "$FORM_radius_key"
+                               save_setting wireless wl0_wep "disabled"
                                ;;
                        wep)
                                save_setting wireless wl0_wep enabled