[src/netbsd-9]: src/etc/rc.d Pull up following revision(s) (requested by seva...

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

details:   https://anonhg.NetBSD.org/src/rev/4a69173833a3
branches:  netbsd-9
changeset: 455080:4a69173833a3
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Oct 06 11:13:35 2019 +0000

description:
Pull up following revision(s) (requested by sevan in ticket #288):

        etc/rc.d/npf_boot: revision 1.2
        etc/rc.d/pf_boot: revision 1.5

No need to empose the script to be runnable during boot time, it
prevents the
script from wroking if the system is booted into single user mode & then
moved onto multi-user mode.

Reported by <pgoyette> for NPF but the issue is there in PF too.

diffstat:

 etc/rc.d/npf_boot |  6 +-----
 etc/rc.d/pf_boot  |  6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diffs (44 lines):

diff -r 1e925f6225af -r 4a69173833a3 etc/rc.d/npf_boot
--- a/etc/rc.d/npf_boot Sun Oct 06 11:04:55 2019 +0000
+++ b/etc/rc.d/npf_boot Sun Oct 06 11:13:35 2019 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: npf_boot,v 1.1 2019/04/02 01:50:32 sevan Exp $
+# $NetBSD: npf_boot,v 1.1.4.1 2019/10/06 11:13:35 martin Exp $
 #
 
 # PROVIDE: npf_boot
@@ -16,10 +16,6 @@
 
 npf_boot_start()
 {
-       if [ "$autoboot" != "yes" ]; then
-               err 1 "This script should only be executed at boot time."
-       fi
-
        if [ -f /etc/npf.boot.conf ]; then
                /sbin/npfctl reload /etc/npf.boot.conf
        elif [ -f /etc/defaults/npf.boot.conf ]; then
diff -r 1e925f6225af -r 4a69173833a3 etc/rc.d/pf_boot
--- a/etc/rc.d/pf_boot  Sun Oct 06 11:04:55 2019 +0000
+++ b/etc/rc.d/pf_boot  Sun Oct 06 11:13:35 2019 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: pf_boot,v 1.4 2008/11/22 20:23:33 tsutsui Exp $
+# $NetBSD: pf_boot,v 1.4.52.1 2019/10/06 11:13:35 martin Exp $
 #
 
 # PROVIDE: pf_boot
@@ -16,10 +16,6 @@
 
 pf_boot_start()
 {
-       if [ "$autoboot" != "yes" ]; then
-               err 1 "This script should only be executed at boot time."
-       fi
-
        if [ -f /etc/pf.boot.conf ]; then
                /sbin/pfctl -q -f /etc/pf.boot.conf
        elif [ -f /etc/defaults/pf.boot.conf ]; then