summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2019-10-06 11:13:35 +0000
committermartin <martin@NetBSD.org>2019-10-06 11:13:35 +0000
commit97e992312ef25489986c902df36417fc06876353 (patch)
treef08ef32c3508731f42d6a11e443ce2b47cc0a97d /etc
parent3bb4c3d277a834cc18a0da52d9dfd84728b8c841 (diff)
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.
Diffstat (limited to 'etc')
-rw-r--r--etc/rc.d/npf_boot6
-rwxr-xr-xetc/rc.d/pf_boot6
2 files changed, 2 insertions, 10 deletions
diff --git a/etc/rc.d/npf_boot b/etc/rc.d/npf_boot
index 2a419b8df48..9ff3fa12e42 100644
--- a/etc/rc.d/npf_boot
+++ b/etc/rc.d/npf_boot
@@ -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
diff --git a/etc/rc.d/pf_boot b/etc/rc.d/pf_boot
index 1a481b134b6..27802f40602 100755
--- a/etc/rc.d/pf_boot
+++ b/etc/rc.d/pf_boot
@@ -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