Changeset 10383


Ignore:
Timestamp:
2008-02-04T23:03:18+01:00 (8 years ago)
Author:
nbd
Message:

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

Location:
trunk/package/iptables
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/iptables/Makefile

    r9906 r10383  
    4141 
    4242define Package/iptables/conffiles 
    43 /etc/config/firewall 
     43/etc/firewall.config 
    4444/etc/firewall.user 
    4545endef 
     
    238238define Package/iptables/install 
    239239        $(INSTALL_DIR) $(1)/etc/config 
    240         $(INSTALL_DATA) ./files/firewall.config $(1)/etc/config/firewall 
     240        $(INSTALL_DATA) ./files/firewall.config $(1)/etc/ 
    241241        $(INSTALL_DIR) $(1)/etc/init.d 
    242242        $(INSTALL_BIN) ./files/firewall.init $(1)/etc/init.d/firewall 
  • trunk/package/iptables/files/firewall.init

    r10367 r10383  
    123123        ## USER RULES 
    124124        [ -f /etc/firewall.user ] && . /etc/firewall.user 
    125         [ -n "$WAN" -a -e /etc/config/firewall ] && { 
     125        [ -n "$WAN" -a -e /etc/firewall.config ] && { 
    126126                export WAN 
    127                 awk -f /usr/lib/common.awk -f /usr/lib/firewall.awk /etc/config/firewall | ash 
     127                awk -f /usr/lib/common.awk -f /usr/lib/firewall.awk /etc/firewall.config | ash 
    128128        } 
    129129} 
Note: See TracChangeset for help on using the changeset viewer.