Module Name: src
Committed By: martin
Date: Sun Oct 6 11:13:35 UTC 2019
Modified Files:
src/etc/rc.d [netbsd-9]: npf_boot pf_boot
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.4.1 src/etc/rc.d/npf_boot
cvs rdiff -u -r1.4 -r1.4.52.1 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.1 src/etc/rc.d/npf_boot:1.1.4.1
--- src/etc/rc.d/npf_boot:1.1 Tue Apr 2 01:50:32 2019
+++ src/etc/rc.d/npf_boot Sun Oct 6 11:13:35 2019
@@ -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 @@ stop_cmd=":"
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
Index: src/etc/rc.d/pf_boot
diff -u src/etc/rc.d/pf_boot:1.4 src/etc/rc.d/pf_boot:1.4.52.1
--- src/etc/rc.d/pf_boot:1.4 Sat Nov 22 20:23:33 2008
+++ src/etc/rc.d/pf_boot Sun Oct 6 11:13:35 2019
@@ -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 @@ stop_cmd=":"
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
