move /etc/config/firewall to /etc/firewall.config to prevent it from interfering with uci - yes, this beast really needs a rewrite :)

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

2 files changed, 4 insertions, 4 deletions

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index aefc7ddce8..8f24a3b3db 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -40,7 +40,7 @@ $(call Package/iptables/Default)
 endef
 
 define Package/iptables/conffiles
-/etc/config/firewall
+/etc/firewall.config
 /etc/firewall.user
 endef
 
@@ -237,7 +237,7 @@ endef
 
 define Package/iptables/install
 	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DATA) ./files/firewall.config $(1)/etc/config/firewall
+	$(INSTALL_DATA) ./files/firewall.config $(1)/etc/
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/firewall.init $(1)/etc/init.d/firewall
 	$(INSTALL_BIN) ./files/firewall.user $(1)/etc/
diff --git a/package/iptables/files/firewall.init b/package/iptables/files/firewall.init
index 2d8c5edbdb..0da97f836f 100755
--- a/package/iptables/files/firewall.init
+++ b/package/iptables/files/firewall.init
@@ -122,9 +122,9 @@ start() {
 
 	## USER RULES
 	[ -f /etc/firewall.user ] && . /etc/firewall.user
-	[ -n "$WAN" -a -e /etc/config/firewall ] && {
+	[ -n "$WAN" -a -e /etc/firewall.config ] && {
 		export WAN
-		awk -f /usr/lib/common.awk -f /usr/lib/firewall.awk /etc/config/firewall | ash
+		awk -f /usr/lib/common.awk -f /usr/lib/firewall.awk /etc/firewall.config | ash
 	}
 }