Module Name:    src
Committed By:   hannken
Date:           Mon Mar 23 18:52:03 UTC 2009

Modified Files:
        src/etc/defaults: rc.conf
        src/etc/rc.d: ipfilter

Log Message:
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 <chris...@netbsd.org>


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/etc/defaults/rc.conf
cvs rdiff -u -r1.17 -r1.18 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.100 src/etc/defaults/rc.conf:1.101
--- src/etc/defaults/rc.conf:1.100	Wed Jan 14 22:07:55 2009
+++ src/etc/defaults/rc.conf	Mon Mar 23 18:52:02 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: rc.conf,v 1.100 2009/01/14 22:07:55 haad Exp $
+#	$NetBSD: rc.conf,v 1.101 2009/03/23 18:52:02 hannken Exp $
 #
 # /etc/defaults/rc.conf --
 #	default configuration of /etc/rc.conf
@@ -143,7 +143,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.17 src/etc/rc.d/ipfilter:1.18
--- src/etc/rc.d/ipfilter:1.17	Sat Nov 22 20:23:33 2008
+++ src/etc/rc.d/ipfilter	Mon Mar 23 18:52:02 2009
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: ipfilter,v 1.17 2008/11/22 20:23:33 tsutsui Exp $
+# $NetBSD: ipfilter,v 1.18 2009/03/23 18:52:02 hannken 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.
 		#

Reply via email to