merge apply-firewall.sh and apply.sh

SVN-Revision: 3280

diff --git a/openwrt/package/webif/files/usr/lib/webif/apply-firewall.sh b/openwrt/package/webif/files/usr/lib/webif/apply-firewall.sh
deleted file mode 100644 (file)
index 8d33ec8..0000000
--- a/openwrt/package/webif/files/usr/lib/webif/apply-firewall.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-HANDLERS_file="${HANDLERS_file}
-       firewall) mv /tmp/.webif/file-firewall /etc/config/firewall && /etc/init.d/S45firewall;;
-"

diff --git a/openwrt/package/webif/files/usr/lib/webif/apply.sh b/openwrt/package/webif/files/usr/lib/webif/apply.sh
index 04ad9c6e17638007247d6c62abcba7f99a0ac3f8..31d6ae3217f15898cd30acfd67ac3062e0d8a4aa 100644 (file)
--- a/openwrt/package/webif/files/usr/lib/webif/apply.sh
+++ b/openwrt/package/webif/files/usr/lib/webif/apply.sh
@@ -10,6 +10,7 @@ HANDLERS_config='
 HANDLERS_file='
        hosts) rm -f /etc/hosts; mv $config /etc/hosts; killall -HUP dnsmasq ;;
        ethers) rm -f /etc/ethers; mv $config /etc/ethers; killall -HUP dnsmasq ;;
+       firewall) mv /tmp/.webif/file-firewall /etc/config/firewall && /etc/init.d/S45firewall;;
 '
 
 # for some reason a for loop with "." doesn't work