[src/trunk]: src/etc/rc.d Revert previous. Explicitly load the value of npf o...

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

details:   https://anonhg.NetBSD.org/src/rev/d5cadc4eeae0
branches:  trunk
changeset: 1026575:d5cadc4eeae0
user:      sborrill <sborrill%NetBSD.org@localhost>
date:      Tue Nov 30 11:00:29 2021 +0000

description:
Revert previous. Explicitly load the value of npf or pf

diffstat:

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

diffs (38 lines):

diff -r c6d0fd02277a -r d5cadc4eeae0 etc/rc.d/npf_boot
--- a/etc/rc.d/npf_boot Tue Nov 30 06:21:58 2021 +0000
+++ b/etc/rc.d/npf_boot Tue Nov 30 11:00:29 2021 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: npf_boot,v 1.5 2021/11/26 13:11:36 sborrill Exp $
+# $NetBSD: npf_boot,v 1.6 2021/11/30 11:00:29 sborrill Exp $
 #
 
 # PROVIDE: npf_boot
@@ -29,5 +29,6 @@
        /sbin/npfctl start
 }
 
-load_rc_config $rcvar
+load_rc_config $name
+load_rc_config_var npf npf
 run_rc_command "$1"
diff -r c6d0fd02277a -r d5cadc4eeae0 etc/rc.d/pf_boot
--- a/etc/rc.d/pf_boot  Tue Nov 30 06:21:58 2021 +0000
+++ b/etc/rc.d/pf_boot  Tue Nov 30 11:00:29 2021 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: pf_boot,v 1.8 2021/11/26 13:11:36 sborrill Exp $
+# $NetBSD: pf_boot,v 1.9 2021/11/30 11:00:29 sborrill Exp $
 #
 
 # PROVIDE: pf_boot
@@ -29,5 +29,6 @@
        /sbin/pfctl -q -e
 }
 
-load_rc_config $rcvar
+load_rc_config $name
+load_rc_config_var pf pf
 run_rc_command "$1"