svn commit: r364357 - stable/12/libexec/rc/rc.d
Cy Schubert
cy at FreeBSD.org
Tue Aug 18 20:41:05 UTC 2020
Author: cy
Date: Tue Aug 18 20:41:03 2020
New Revision: 364357
URL: https://svnweb.freebsd.org/changeset/base/364357
Log:
MFC r364133:
When booting a system with WITHOUT_IPFILTER the following errors
are encountered at boot time:
rcorder: requirement `ipfs' in file `/etc/rc.d/netif' has no providers.
rcorder: requirement `ipfilter' in file `/etc/rc.d/netif' has no
providers.
rcorder: requirement `ipfilter' in file `/etc/rc.d/netwait' has no
providers.
rcorder: requirement `ipfilter' in file `/etc/rc.d/net_watchdog' has no
providers.
rcorder: requirement `ipfilter' in file `/etc/rc.d/securelevel' has no
providers.
Listing its own requrements in BEFORE rather than use REQUIRE of
non-optional scripts resolves this issue.
The issue was discovered and patched by glebius at Netflix.
Submitted by: glebius
Reported by: glebius
Modified:
stable/12/libexec/rc/rc.d/ipfilter
stable/12/libexec/rc/rc.d/ipmon
stable/12/libexec/rc/rc.d/ipnat
stable/12/libexec/rc/rc.d/netif
stable/12/libexec/rc/rc.d/netwait
stable/12/libexec/rc/rc.d/securelevel
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/libexec/rc/rc.d/ipfilter
==============================================================================
--- stable/12/libexec/rc/rc.d/ipfilter Tue Aug 18 20:20:45 2020 (r364356)
+++ stable/12/libexec/rc/rc.d/ipfilter Tue Aug 18 20:41:03 2020 (r364357)
@@ -5,6 +5,7 @@
# PROVIDE: ipfilter
# REQUIRE: FILESYSTEMS
+# BEFORE: ipmon ipnat netif netwait securelevel
# KEYWORD: nojailvnet
. /etc/rc.subr
Modified: stable/12/libexec/rc/rc.d/ipmon
==============================================================================
--- stable/12/libexec/rc/rc.d/ipmon Tue Aug 18 20:20:45 2020 (r364356)
+++ stable/12/libexec/rc/rc.d/ipmon Tue Aug 18 20:41:03 2020 (r364357)
@@ -4,7 +4,7 @@
#
# PROVIDE: ipmon
-# REQUIRE: FILESYSTEMS hostname sysctl ipfilter
+# REQUIRE: FILESYSTEMS hostname sysctl
# BEFORE: SERVERS
# KEYWORD: nojailvnet
Modified: stable/12/libexec/rc/rc.d/ipnat
==============================================================================
--- stable/12/libexec/rc/rc.d/ipnat Tue Aug 18 20:20:45 2020 (r364356)
+++ stable/12/libexec/rc/rc.d/ipnat Tue Aug 18 20:41:03 2020 (r364357)
@@ -4,7 +4,6 @@
#
# PROVIDE: ipnat
-# REQUIRE: ipfilter
# KEYWORD: nojailvnet
. /etc/rc.subr
Modified: stable/12/libexec/rc/rc.d/netif
==============================================================================
--- stable/12/libexec/rc/rc.d/netif Tue Aug 18 20:20:45 2020 (r364356)
+++ stable/12/libexec/rc/rc.d/netif Tue Aug 18 20:41:03 2020 (r364357)
@@ -27,7 +27,7 @@
# PROVIDE: netif
# REQUIRE: FILESYSTEMS iovctl serial sppp sysctl
-# REQUIRE: hostid ipfilter ipfs
+# REQUIRE: hostid ipfs
# KEYWORD: nojailvnet
. /etc/rc.subr
Modified: stable/12/libexec/rc/rc.d/netwait
==============================================================================
--- stable/12/libexec/rc/rc.d/netwait Tue Aug 18 20:20:45 2020 (r364356)
+++ stable/12/libexec/rc/rc.d/netwait Tue Aug 18 20:41:03 2020 (r364357)
@@ -3,7 +3,7 @@
# $FreeBSD$
#
# PROVIDE: netwait
-# REQUIRE: devd ipfilter ipfw pf routing
+# REQUIRE: devd ipfw pf routing
# KEYWORD: nojail
#
# The netwait script helps handle two situations:
Modified: stable/12/libexec/rc/rc.d/securelevel
==============================================================================
--- stable/12/libexec/rc/rc.d/securelevel Tue Aug 18 20:20:45 2020 (r364356)
+++ stable/12/libexec/rc/rc.d/securelevel Tue Aug 18 20:41:03 2020 (r364357)
@@ -4,7 +4,7 @@
#
# PROVIDE: securelevel
-# REQUIRE: adjkerntz ipfw ipfilter pf
+# REQUIRE: adjkerntz ipfw pf
. /etc/rc.subr
More information about the svn-src-stable-12
mailing list