[package] firewall: process custom rules after forwardings and redirects, this actual...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15278 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 7aa3855..dfbef61 100644 (file)
--- a/package/firewall/Makefile
+++ b/package/firewall/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=firewall
 
 PKG_VERSION:=1
 PKG_NAME:=firewall
 
 PKG_VERSION:=1

-PKG_RELEASE:=2
+PKG_RELEASE:=3

 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/package/firewall/files/uci_firewall.sh b/package/firewall/files/uci_firewall.sh
index f6fa82b..c197003 100755 (executable)
--- a/package/firewall/files/uci_firewall.sh
+++ b/package/firewall/files/uci_firewall.sh
@@ -401,12 +401,12 @@ fw_init() {
        config_foreach fw_defaults defaults
        echo "Loading zones"
        config_foreach fw_zone zone
        config_foreach fw_defaults defaults
        echo "Loading zones"
        config_foreach fw_zone zone

-       echo "Loading rules"
-       config_foreach fw_rule rule

        echo "Loading forwarding"
        config_foreach fw_forwarding forwarding
        echo "Loading redirects"
        config_foreach fw_redirect redirect
        echo "Loading forwarding"
        config_foreach fw_forwarding forwarding
        echo "Loading redirects"
        config_foreach fw_redirect redirect

+       echo "Loading rules"
+       config_foreach fw_rule rule

        echo "Loading includes"
        config_foreach fw_include include
        uci_set_state firewall core loaded 1
        echo "Loading includes"
        config_foreach fw_include include
        uci_set_state firewall core loaded 1