Module Name: src
Committed By: sevan
Date: Wed Apr 10 00:32:15 UTC 2019
Modified Files:
src/distrib/sets/lists/etc: mi
src/etc/defaults: Makefile
src/etc/rc.d: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.254 -r1.255 src/distrib/sets/lists/etc/mi
cvs rdiff -u -r1.6 -r1.7 src/etc/defaults/Makefile
cvs rdiff -u -r1.99 -r1.100 src/etc/rc.d/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/etc/mi
diff -u src/distrib/sets/lists/etc/mi:1.254 src/distrib/sets/lists/etc/mi:1.255
--- src/distrib/sets/lists/etc/mi:1.254 Sat Jan 12 17:25:09 2019
+++ src/distrib/sets/lists/etc/mi Wed Apr 10 00:32:15 2019
@@ -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
Index: src/etc/defaults/Makefile
diff -u src/etc/defaults/Makefile:1.6 src/etc/defaults/Makefile:1.7
--- src/etc/defaults/Makefile:1.6 Wed May 1 05:36:25 2013
+++ src/etc/defaults/Makefile Wed Apr 10 00:32:15 2019
@@ -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}
Index: src/etc/rc.d/Makefile
diff -u src/etc/rc.d/Makefile:1.99 src/etc/rc.d/Makefile:1.100
--- src/etc/rc.d/Makefile:1.99 Sun Sep 23 07:24:19 2018
+++ src/etc/rc.d/Makefile Wed Apr 10 00:32:15 2019
@@ -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 @@ CONFIGFILES=\
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 \
