svn commit: r364881 - stable/12/libexec/rc/rc.d

[Edward Tomasz Napierala]

Author: trasz
Date: Thu Aug 27 19:37:28 2020
New Revision: 364881
URL: https://svnweb.freebsd.org/changeset/base/364881

Log:
  MFC r352999:
  
  Rename etc/rc.d/abi to etc/rc.d/linux; after moving out the SysV IPC stuff
  it's entirely linux-specific.
  
  MFC r353054:
  
  Add rcvar back to the linux rc script.  Without it it was enabled
  unconditionally.
  
  Sponsored by:	The FreeBSD Foundation

Added:
  stable/12/libexec/rc/rc.d/linux
     - copied, changed from r352999, head/libexec/rc/rc.d/linux
Deleted:
  stable/12/libexec/rc/rc.d/abi
Modified:
  stable/12/libexec/rc/rc.d/Makefile
  stable/12/libexec/rc/rc.d/SERVERS
  stable/12/libexec/rc/rc.d/localpkg
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/libexec/rc/rc.d/Makefile
==============================================================================
--- stable/12/libexec/rc/rc.d/Makefile	Thu Aug 27 19:35:02 2020	(r364880)
+++ stable/12/libexec/rc/rc.d/Makefile	Thu Aug 27 19:37:28 2020	(r364881)
@@ -11,7 +11,6 @@ CONFS=	DAEMON \
 	LOGIN \
 	NETWORKING \
 	SERVERS \
-	abi \
 	addswap \
 	adjkerntz \
 	archdep \
@@ -54,6 +53,7 @@ CONFS=	DAEMON \
 	kldxref \
 	${_kpasswdd} \
 	ldconfig \
+	linux \
 	local \
 	localpkg \
 	lockd \

Modified: stable/12/libexec/rc/rc.d/SERVERS
==============================================================================
--- stable/12/libexec/rc/rc.d/SERVERS	Thu Aug 27 19:35:02 2020	(r364880)
+++ stable/12/libexec/rc/rc.d/SERVERS	Thu Aug 27 19:37:28 2020	(r364881)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: SERVERS
-# REQUIRE: mountcritremote sysvipc abi ldconfig savecore watchdogd
+# REQUIRE: mountcritremote sysvipc linux ldconfig savecore watchdogd
 
 #	This is a dummy dependency, for early-start servers relying on
 #	some basic configuration.

Copied and modified: stable/12/libexec/rc/rc.d/linux (from r352999, head/libexec/rc/rc.d/linux)
==============================================================================
--- head/libexec/rc/rc.d/linux	Wed Oct  2 11:40:40 2019	(r352999, copy source)
+++ stable/12/libexec/rc/rc.d/linux	Thu Aug 27 19:37:28 2020	(r364881)
@@ -11,6 +11,7 @@
 
 name="linux"
 desc="Enable Linux ABI"
+rcvar="linux_enable"
 start_cmd="${name}_start"
 stop_cmd=":"
 

Modified: stable/12/libexec/rc/rc.d/localpkg
==============================================================================
--- stable/12/libexec/rc/rc.d/localpkg	Thu Aug 27 19:35:02 2020	(r364880)
+++ stable/12/libexec/rc/rc.d/localpkg	Thu Aug 27 19:37:28 2020	(r364881)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: localpkg
-# REQUIRE: sysvipc abi
+# REQUIRE: sysvipc linux
 # BEFORE:  securelevel
 # KEYWORD: shutdown