Merge r15221 & r15278 to 8.09

SVN-Revision: 15282

diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 9d4e5dd31a727e6de1573058b04ebb424006e109..dfbef6106d28c8ab1b115ccabf1725dfad8659f5 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_RELEASE:=1
+PKG_RELEASE:=3
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/package/firewall/files/firewall.config b/package/firewall/files/firewall.config
old mode 100755 (executable)
new mode 100644 (file)
index 46f7de5..464540f
--- a/package/firewall/files/firewall.config
+++ b/package/firewall/files/firewall.config
@@ -22,6 +22,10 @@ config forwarding
        option dest     wan
        option mtu_fix  1
 
+# include a file with users custom iptables rules
+config include
+       option path /etc/firewall.user
+
 
 ### EXAMPLE CONFIG SECTIONS
 # do not allow a specific ip to access wan
@@ -53,10 +57,6 @@ config forwarding
 #      option dest_port        80 
 #      option proto            tcp
 
-# include a file with users custom iptables rules
-#config include
-#      option path /etc/firewall.user
-
 
 ### FULL CONFIG SECTIONS
 #config rule

diff --git a/package/firewall/files/firewall.user b/package/firewall/files/firewall.user
new file mode 100644 (file)
index 0000000..1ccbd01
--- /dev/null
+++ b/package/firewall/files/firewall.user
@@ -0,0 +1,4 @@
+# This file is interpreted as shell script.
+# Put your custom iptables rules here, they will
+# be executed with each firewall (re-)start.
+

diff --git a/package/firewall/files/uci_firewall.sh b/package/firewall/files/uci_firewall.sh
index f6fa82b9cb0a249c9b89b3724f235bcf47a1ad59..c197003595372804093f10d4ad0c92c42c8b94b4 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
-       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 rules"
+       config_foreach fw_rule rule
        echo "Loading includes"
        config_foreach fw_include include
        uci_set_state firewall core loaded 1