Changeset 15282


Ignore:
Timestamp:
2009-04-19T22:54:54+02:00 (9 years ago)
Author:
jow
Message:

Merge r15221 & r15278 to 8.09

Location:
branches/8.09/package/firewall
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/8.09/package/firewall/Makefile

    r12649 r15282  
    1010 
    1111PKG_VERSION:=1 
    12 PKG_RELEASE:=1 
     12PKG_RELEASE:=3 
    1313 
    1414include $(INCLUDE_DIR)/package.mk 
  • branches/8.09/package/firewall/files/firewall.config

    • Property svn:executable deleted
    r14294 r15282  
    2222        option dest     wan 
    2323        option mtu_fix  1 
     24 
     25# include a file with users custom iptables rules 
     26config include 
     27        option path /etc/firewall.user 
    2428 
    2529 
     
    5458#       option proto            tcp 
    5559 
    56 # include a file with users custom iptables rules 
    57 #config include 
    58 #       option path /etc/firewall.user 
    59  
    6060 
    6161### FULL CONFIG SECTIONS 
  • branches/8.09/package/firewall/files/uci_firewall.sh

    r14116 r15282  
    402402        echo "Loading zones" 
    403403        config_foreach fw_zone zone 
    404         echo "Loading rules" 
    405         config_foreach fw_rule rule 
    406404        echo "Loading forwarding" 
    407405        config_foreach fw_forwarding forwarding 
    408406        echo "Loading redirects" 
    409407        config_foreach fw_redirect redirect 
     408        echo "Loading rules" 
     409        config_foreach fw_rule rule 
    410410        echo "Loading includes" 
    411411        config_foreach fw_include include 
Note: See TracChangeset for help on using the changeset viewer.