Module Name: src Committed By: christos Date: Fri Jun 5 17:10:44 UTC 2020
Modified Files: src/etc/defaults: rc.conf src/etc/rc.d: npfd Log Message: Add support for npfd_flags To generate a diff of this commit: cvs rdiff -u -r1.156 -r1.157 src/etc/defaults/rc.conf cvs rdiff -u -r1.1 -r1.2 src/etc/rc.d/npfd 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.156 src/etc/defaults/rc.conf:1.157 --- src/etc/defaults/rc.conf:1.156 Sun May 31 08:58:09 2020 +++ src/etc/defaults/rc.conf Fri Jun 5 13:10:44 2020 @@ -1,4 +1,4 @@ -# $NetBSD: rc.conf,v 1.156 2020/05/31 12:58:09 roy Exp $ +# $NetBSD: rc.conf,v 1.157 2020/06/05 17:10:44 christos Exp $ # # /etc/defaults/rc.conf -- # default configuration of /etc/rc.conf @@ -179,7 +179,7 @@ ifconfig_wait_dad_flags="-w 15 -W 5" mdnsd=NO npf=NO -npfd=NO +npfd=NO npfd_flags="" ipfilter=NO ipfilter_flags="" # uses /etc/ipf.conf ipnat=NO # uses /etc/ipnat.conf ipfs=NO ipfs_flags="" # save/load ipnat and ipf states Index: src/etc/rc.d/npfd diff -u src/etc/rc.d/npfd:1.1 src/etc/rc.d/npfd:1.2 --- src/etc/rc.d/npfd:1.1 Thu Jan 5 09:39:09 2017 +++ src/etc/rc.d/npfd Fri Jun 5 13:10:44 2020 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: npfd,v 1.1 2017/01/05 14:39:09 christos Exp $ +# $NetBSD: npfd,v 1.2 2020/06/05 17:10:44 christos Exp $ # # PROVIDE: npfd @@ -11,8 +11,15 @@ $_rc_subr_loaded . /etc/rc.subr name="npfd" rcvar=$name +start_cmd="npfd_start" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" +npfd_start() +{ + echo "Starting npfd..." + /usr/sbin/${name} $rc_flags +} + load_rc_config $name run_rc_command "$1"