Module Name: src
Committed By: snj
Date: Thu Mar 26 17:45:38 UTC 2009
Modified Files:
src/etc/defaults [netbsd-5]: rc.conf
src/etc/rc.d [netbsd-5]: ipfilter
Log Message:
Pull up following revision(s) (requested by hannken in ticket #606):
etc/defaults/rc.conf: revision 1.101
etc/rc.d/ipfilter: revision 1.18
Add flags to rc.d/ipfilter. Use it from rc.conf like
ipfilter=YES ipfilter_flags="-T fr_statemax=18963,fr_statesize=27091"
Ok: Christos Zoulas <[email protected]>
To generate a diff of this commit:
cvs rdiff -u -r1.95.2.2 -r1.95.2.3 src/etc/defaults/rc.conf
cvs rdiff -u -r1.15 -r1.15.20.1 src/etc/rc.d/ipfilter
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/defaults/rc.conf
diff -u src/etc/defaults/rc.conf:1.95.2.2 src/etc/defaults/rc.conf:1.95.2.3
--- src/etc/defaults/rc.conf:1.95.2.2 Fri Feb 6 00:51:41 2009
+++ src/etc/defaults/rc.conf Thu Mar 26 17:45:38 2009
@@ -1,4 +1,4 @@
-# $NetBSD: rc.conf,v 1.95.2.2 2009/02/06 00:51:41 snj Exp $
+# $NetBSD: rc.conf,v 1.95.2.3 2009/03/26 17:45:38 snj Exp $
#
# /etc/defaults/rc.conf --
# default configuration of /etc/rc.conf
@@ -142,7 +142,7 @@
# Networking startup.
#
-ipfilter=NO # uses /etc/ipf.conf
+ipfilter=NO ipfilter_flags="" # uses /etc/ipf.conf
ipnat=NO # uses /etc/ipnat.conf
ipfs=NO ipfs_flags="" # save/load ipnat and ipf states
ipsec=NO # uses /etc/ipsec.conf
Index: src/etc/rc.d/ipfilter
diff -u src/etc/rc.d/ipfilter:1.15 src/etc/rc.d/ipfilter:1.15.20.1
--- src/etc/rc.d/ipfilter:1.15 Fri Apr 6 14:20:17 2007
+++ src/etc/rc.d/ipfilter Thu Mar 26 17:45:38 2009
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: ipfilter,v 1.15 2007/04/06 14:20:17 apb Exp $
+# $NetBSD: ipfilter,v 1.15.20.1 2009/03/26 17:45:38 snj Exp $
#
# PROVIDE: ipfilter
@@ -36,7 +36,7 @@
ipfilter_start()
{
echo "Enabling ipfilter."
- /sbin/ipf -E
+ /sbin/ipf ${rc_flags} -E
# Do the flush first; since older ipf has different semantics.
#
