Module Name: src
Committed By: sborrill
Date: Tue Nov 30 11:00:29 UTC 2021
Modified Files:
src/etc/rc.d: npf_boot pf_boot
Log Message:
Revert previous. Explicitly load the value of npf or pf
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/etc/rc.d/npf_boot
cvs rdiff -u -r1.8 -r1.9 src/etc/rc.d/pf_boot
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/npf_boot
diff -u src/etc/rc.d/npf_boot:1.5 src/etc/rc.d/npf_boot:1.6
--- src/etc/rc.d/npf_boot:1.5 Fri Nov 26 13:11:36 2021
+++ src/etc/rc.d/npf_boot Tue Nov 30 11:00:29 2021
@@ -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 @@ npf_boot_start()
/sbin/npfctl start
}
-load_rc_config $rcvar
+load_rc_config $name
+load_rc_config_var npf npf
run_rc_command "$1"
Index: src/etc/rc.d/pf_boot
diff -u src/etc/rc.d/pf_boot:1.8 src/etc/rc.d/pf_boot:1.9
--- src/etc/rc.d/pf_boot:1.8 Fri Nov 26 13:11:36 2021
+++ src/etc/rc.d/pf_boot Tue Nov 30 11:00:29 2021
@@ -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 @@ pf_boot_start()
/sbin/pfctl -q -e
}
-load_rc_config $rcvar
+load_rc_config $name
+load_rc_config_var pf pf
run_rc_command "$1"
