[src/trunk]: src/etc/rc.d Do not start npf again at reboot (it is started via...

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

details:   https://anonhg.NetBSD.org/src/rev/4407f0e0467a
branches:  trunk
changeset: 450596:4407f0e0467a
user:      leot <leot%NetBSD.org@localhost>
date:      Fri Apr 19 18:36:25 2019 +0000

description:
Do not start npf again at reboot (it is started via npf_boot)

diffstat:

 etc/rc.d/npf |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r 111d16588c70 -r 4407f0e0467a etc/rc.d/npf
--- a/etc/rc.d/npf      Fri Apr 19 16:28:32 2019 +0000
+++ b/etc/rc.d/npf      Fri Apr 19 18:36:25 2019 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: npf,v 1.3 2012/11/01 06:06:14 mrg Exp $
+# $NetBSD: npf,v 1.4 2019/04/19 18:36:25 leot Exp $
 #
 # Public Domain.
 #
@@ -36,7 +36,11 @@
        echo "Enabling NPF."
        npf_cfg_check
        /sbin/npfctl reload
-       /sbin/npfctl start
+
+       # The npf_boot script has enabled npf already.
+       if [ "$autoboot" != "yes" ]; then
+               /sbin/npfctl start
+       fi
 }
 
 npf_stop()