mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-24 15:43:25 +00:00
move /etc/config/firewall to /etc/firewall.config to prevent it from interfering with uci - yes, this beast really needs a rewrite :)
SVN-Revision: 10383
This commit is contained in:
parent
04caf0a56c
commit
c89de79512
@ -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/
|
||||
|
@ -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
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user