From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 12 Apr 2009 22:38:34 +0000 (+0000)
Subject: firewall: enable /etc/firewall.user by default and install sample firewall.user file
X-Git-Tag: reboot~23980
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=97100e0248e722aed43925177a12f2d3ab7a7753;p=openwrt%2Fstaging%2Fblogic.git

firewall: enable /etc/firewall.user by default and install sample firewall.user file

SVN-Revision: 15221
---

diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index 9d4e5dd31a72..7aa385511f76 100644
--- 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:=2
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/firewall/files/firewall.config b/package/firewall/files/firewall.config
old mode 100755
new mode 100644
index 46f7de5d77fb..464540f9901c
--- 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
index 000000000000..1ccbd0165742
--- /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.
+