make sure uci firewall reverts its states when stopped

[openwrt-10.03/.git] / package / firewall / files / uci_firewall.sh

diff --git a/package/firewall/files/uci_firewall.sh b/package/firewall/files/uci_firewall.sh
index c488c1942442f735239b5e6ccd03b448c4aab45e..5063d9e0884f1696b238d9a47c05b79f9bc6212b 100755 (executable)
--- a/package/firewall/files/uci_firewall.sh
+++ b/package/firewall/files/uci_firewall.sh
@@ -302,10 +302,10 @@ fw_init() {
        config_foreach fw_forwarding forwarding
        echo "Loading redirects"
        config_foreach fw_redirect redirect
-       echo "Loading includes"
-       config_foreach fw_include include
        echo "Adding custom chains"
        fw_custom_chains
+       echo "Loading includes"
+       config_foreach fw_include include
 
        uci_set_state firewall core "" firewall_state 
        uci_set_state firewall core loaded 1
@@ -323,4 +323,5 @@ fw_stop() {
        $IPTABLES -P INPUT ACCEPT
        $IPTABLES -P OUTPUT ACCEPT
        $IPTABLES -P FORWARD ACCEPT
+       uci_revert_state firewall core
 }