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

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

details:   https://anonhg.NetBSD.org/src/rev/c8e82c2a096a
branches:  netbsd-9
changeset: 1026495:c8e82c2a096a
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Nov 26 16:50:18 2021 +0000

description:
Pull up following revision(s) (requested by sborrill in ticket #1377):

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

Load rc configuration based on rcvar, not name, so that correct settings
in /etc/rc.conf.d are loaded.

Usually this does not matter as rcvar and name are set to the same value.

For pf_boot and npf_boot, rcvar is set to pf and npf respectively.

Prior to the change, if:
rc.conf contains nfp=YES
rc.conf.d/npf does not exist
Then:
/etc/rc.d/npf_boot rcvar
outputs:
$npf=YES

If:
rc.conf contains npf=NO (or is not set)
rc.conf.d/npf contains npf=YES
Then:
/etc/rc.d/npf_boot rcvar
outputs:
$npf=NO

This means that in the latter case, at boot time the npfctl start command
is never run and the firewall is not operational.

diffstat:

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

diffs (36 lines):

diff -r 614a14cf8576 -r c8e82c2a096a etc/rc.d/npf_boot
--- a/etc/rc.d/npf_boot Thu Nov 25 17:50:25 2021 +0000
+++ b/etc/rc.d/npf_boot Fri Nov 26 16:50:18 2021 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: npf_boot,v 1.1.4.1 2019/10/06 11:13:35 martin Exp $
+# $NetBSD: npf_boot,v 1.1.4.2 2021/11/26 16:50:18 martin Exp $
 #
 
 # PROVIDE: npf_boot
@@ -29,5 +29,5 @@
        /sbin/npfctl start
 }
 
-load_rc_config $name
+load_rc_config $rcvar
 run_rc_command "$1"
diff -r 614a14cf8576 -r c8e82c2a096a etc/rc.d/pf_boot
--- a/etc/rc.d/pf_boot  Thu Nov 25 17:50:25 2021 +0000
+++ b/etc/rc.d/pf_boot  Fri Nov 26 16:50:18 2021 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: pf_boot,v 1.4.52.1 2019/10/06 11:13:35 martin Exp $
+# $NetBSD: pf_boot,v 1.4.52.2 2021/11/26 16:50:18 martin Exp $
 #
 
 # PROVIDE: pf_boot
@@ -29,5 +29,5 @@
        /sbin/pfctl -q -e
 }
 
-load_rc_config $name
+load_rc_config $rcvar
 run_rc_command "$1"