domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
SVN-Revision: 10383
This commit is contained in:
Felix Fietkau
2008-02-04 22:03:18 +00:00
parent 04caf0a56c
commit c89de79512
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
package/iptables/Makefile
View File

@@ -40,7 +40,7 @@ $(call Package/iptables/Default)
endef endef
define Package/iptables/conffiles define Package/iptables/conffiles
/etc/config/firewall /etc/firewall.config
/etc/firewall.user /etc/firewall.user
endef endef
@@ -237,7 +237,7 @@ endef
define Package/iptables/install define Package/iptables/install
$(INSTALL_DIR) $(1)/etc/config $(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_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/firewall.init $(1)/etc/init.d/firewall $(INSTALL_BIN) ./files/firewall.init $(1)/etc/init.d/firewall
$(INSTALL_BIN) ./files/firewall.user $(1)/etc/ $(INSTALL_BIN) ./files/firewall.user $(1)/etc/

4
package/iptables/files/firewall.init
View File

@@ -122,9 +122,9 @@ start() {
## USER RULES ## USER RULES
[ -f /etc/firewall.user ] && . /etc/firewall.user [ -f /etc/firewall.user ] && . /etc/firewall.user
[ -n "$WAN" -a -e /etc/config/firewall ] && { [ -n "$WAN" -a -e /etc/firewall.config ] && {
export WAN 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
} }
} }