[src/trunk]: src/etc/rc.d Include npf_boot rc.d scripts which loads an interi...

[sevan <sevan%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b130d33a37d0
branches:  trunk
changeset: 998169:b130d33a37d0
user:      sevan <sevan%NetBSD.org@localhost>
date:      Wed Apr 10 00:32:15 2019 +0000

description:
Include npf_boot rc.d scripts which loads an interim config early in boot.
By default /etc/default/npf.boot.conf which can be overriden by /etc/npf.boot.conf.

diffstat:

 distrib/sets/lists/etc/mi |  6 ++++--
 etc/defaults/Makefile     |  5 +++--
 etc/rc.d/Makefile         |  6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diffs (62 lines):

diff -r 9e66e6498195 -r b130d33a37d0 distrib/sets/lists/etc/mi
--- a/distrib/sets/lists/etc/mi Wed Apr 10 00:18:39 2019 +0000
+++ b/distrib/sets/lists/etc/mi Wed Apr 10 00:32:15 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.254 2019/01/12 17:25:09 roy Exp $
+# $NetBSD: mi,v 1.255 2019/04/10 00:32:15 sevan Exp $
 #
 # Note: end-user configuration files that are moved to another location
 #      should not be marked "obsolete"; they should just be removed from
@@ -46,7 +46,8 @@
 ./etc/default/security.conf                    etc-obsolete            obsolete
 ./etc/default/weekly.conf                      etc-obsolete            obsolete
 ./etc/defaults/daily.conf                      etc-sys-defaults
-./etc/defaults/monthly.conf                    etc-sys-defaults
+./etc/defaults/monthly.conf                    etc-sys-defaults        npf
+./etc/defaults/npf.boot.conf                   etc-pf-defaults         pf
 ./etc/defaults/pf.boot.conf                    etc-pf-defaults         pf
 ./etc/defaults/pkgpath.conf                    etc-sys-defaults
 ./etc/defaults/rc.conf                         etc-sys-defaults
@@ -263,6 +264,7 @@
 ./etc/rc.d/nfsd                                        etc-nfsserver-rc
 ./etc/rc.d/nfslocking                          etc-nfsserver-rc
 ./etc/rc.d/npf                                 etc-npf-rc
+./etc/rc.d/npf_boot                            etc-npf-rc
 ./etc/rc.d/npfd                                        etc-npf-rc
 ./etc/rc.d/nsd                                 etc-nsd-rc              nsd
 ./etc/rc.d/ntpd                                        etc-ntp-rc
diff -r 9e66e6498195 -r b130d33a37d0 etc/defaults/Makefile
--- a/etc/defaults/Makefile     Wed Apr 10 00:18:39 2019 +0000
+++ b/etc/defaults/Makefile     Wed Apr 10 00:32:15 2019 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.6 2013/05/01 05:36:25 agc Exp $
+#      $NetBSD: Makefile,v 1.7 2019/04/10 00:32:15 sevan Exp $
 
 .include <bsd.own.mk>
 
-CONFIGFILES=   daily.conf monthly.conf pkgpath.conf security.conf weekly.conf
+CONFIGFILES=   daily.conf monthly.conf npf.boot.conf pkgpath.conf \
+                   security.conf weekly.conf
 FILESDIR=      /etc/defaults
 FILESMODE=     ${NONBINMODE}
 
diff -r 9e66e6498195 -r b130d33a37d0 etc/rc.d/Makefile
--- a/etc/rc.d/Makefile Wed Apr 10 00:18:39 2019 +0000
+++ b/etc/rc.d/Makefile Wed Apr 10 00:32:15 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2018/09/23 07:24:19 maxv Exp $
+# $NetBSD: Makefile,v 1.100 2019/04/10 00:32:15 sevan Exp $
 
 .include <bsd.own.mk>
 
@@ -30,8 +30,8 @@
                ldconfig ldpd local lpd lvm \
                makemandb mdnsd mixerctl modules mopd motd mountall \
                mountcritlocal mountcritremote mountd moused mrouted \
-               named ndbootd network newsyslog nfsd nfslocking npf npfd ntpd \
-               ntpdate \
+               named ndbootd network newsyslog nfsd nfslocking npf npf_boot \
+               npfd ntpd ntpdate \
                perusertmp pf pf_boot pflogd postfix powerd ppp pwcheck \
                quota \
                racoon rpcbind raidframe raidframeparity random_seed rarpd \