svn commit: r364133 - head/libexec/rc/rc.d

[Cy Schubert]

Author: cy
Date: Tue Aug 11 23:36:38 2020
New Revision: 364133
URL: https://svnweb.freebsd.org/changeset/base/364133

Log:
  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
  MFC after:	1 week

Modified:
  head/libexec/rc/rc.d/ipfilter
  head/libexec/rc/rc.d/ipmon
  head/libexec/rc/rc.d/ipnat
  head/libexec/rc/rc.d/netif
  head/libexec/rc/rc.d/netwait
  head/libexec/rc/rc.d/securelevel

Modified: head/libexec/rc/rc.d/ipfilter
==============================================================================
--- head/libexec/rc/rc.d/ipfilter	Tue Aug 11 22:33:56 2020	(r364132)
+++ head/libexec/rc/rc.d/ipfilter	Tue Aug 11 23:36:38 2020	(r364133)
@@ -5,6 +5,7 @@
 
 # PROVIDE: ipfilter
 # REQUIRE: FILESYSTEMS
+# BEFORE: ipmon ipnat netif netwait securelevel
 # KEYWORD: nojailvnet
 
 . /etc/rc.subr

Modified: head/libexec/rc/rc.d/ipmon
==============================================================================
--- head/libexec/rc/rc.d/ipmon	Tue Aug 11 22:33:56 2020	(r364132)
+++ head/libexec/rc/rc.d/ipmon	Tue Aug 11 23:36:38 2020	(r364133)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: ipmon
-# REQUIRE: FILESYSTEMS hostname sysctl ipfilter
+# REQUIRE: FILESYSTEMS hostname sysctl
 # BEFORE:  SERVERS
 # KEYWORD: nojailvnet
 

Modified: head/libexec/rc/rc.d/ipnat
==============================================================================
--- head/libexec/rc/rc.d/ipnat	Tue Aug 11 22:33:56 2020	(r364132)
+++ head/libexec/rc/rc.d/ipnat	Tue Aug 11 23:36:38 2020	(r364133)
@@ -4,7 +4,6 @@
 #
 
 # PROVIDE: ipnat
-# REQUIRE: ipfilter
 # KEYWORD: nojailvnet
 
 . /etc/rc.subr

Modified: head/libexec/rc/rc.d/netif
==============================================================================
--- head/libexec/rc/rc.d/netif	Tue Aug 11 22:33:56 2020	(r364132)
+++ head/libexec/rc/rc.d/netif	Tue Aug 11 23:36:38 2020	(r364133)
@@ -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: head/libexec/rc/rc.d/netwait
==============================================================================
--- head/libexec/rc/rc.d/netwait	Tue Aug 11 22:33:56 2020	(r364132)
+++ head/libexec/rc/rc.d/netwait	Tue Aug 11 23:36:38 2020	(r364133)
@@ -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: head/libexec/rc/rc.d/securelevel
==============================================================================
--- head/libexec/rc/rc.d/securelevel	Tue Aug 11 22:33:56 2020	(r364132)
+++ head/libexec/rc/rc.d/securelevel	Tue Aug 11 23:36:38 2020	(r364133)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: securelevel
-# REQUIRE: adjkerntz ipfw ipfilter pf
+# REQUIRE: adjkerntz ipfw pf
 
 . /etc/rc.subr