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

[Edward Tomasz Napierala]

Author: trasz
Date: Wed Oct  2 11:40:40 2019
New Revision: 352999
URL: https://svnweb.freebsd.org/changeset/base/352999

Log:
  Rename etc/rc.d/abi to etc/rc.d/linux; after moving out the SysV IPC stuff
  it's entirely linux-specific.
  
  Reviewed by:	emaste
  MFC after:	2 weeks
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D21830

Added:
  head/libexec/rc/rc.d/linux
     - copied, changed from r352839, head/libexec/rc/rc.d/abi
Deleted:
  head/libexec/rc/rc.d/abi
Modified:
  head/libexec/rc/rc.d/Makefile
  head/libexec/rc/rc.d/SERVERS
  head/libexec/rc/rc.d/localpkg

Modified: head/libexec/rc/rc.d/Makefile
==============================================================================
--- head/libexec/rc/rc.d/Makefile	Wed Oct  2 11:15:35 2019	(r352998)
+++ head/libexec/rc/rc.d/Makefile	Wed Oct  2 11:40:40 2019	(r352999)
@@ -11,7 +11,6 @@ CONFS=	DAEMON \
 	LOGIN \
 	NETWORKING \
 	SERVERS \
-	abi \
 	addswap \
 	adjkerntz \
 	archdep \
@@ -51,6 +50,7 @@ CONFS=	DAEMON \
 	kldxref \
 	${_kpasswdd} \
 	ldconfig \
+	linux \
 	local \
 	localpkg \
 	lockd \

Modified: head/libexec/rc/rc.d/SERVERS
==============================================================================
--- head/libexec/rc/rc.d/SERVERS	Wed Oct  2 11:15:35 2019	(r352998)
+++ head/libexec/rc/rc.d/SERVERS	Wed Oct  2 11:40:40 2019	(r352999)
@@ -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: head/libexec/rc/rc.d/linux (from r352839, head/libexec/rc/rc.d/abi)
==============================================================================
--- head/libexec/rc/rc.d/abi	Sat Sep 28 09:50:01 2019	(r352839, copy source)
+++ head/libexec/rc/rc.d/linux	Wed Oct  2 11:40:40 2019	(r352999)
@@ -3,14 +3,14 @@
 # $FreeBSD$
 #
 
-# PROVIDE: abi
+# PROVIDE: linux
 # REQUIRE: archdep
 # KEYWORD: nojail
 
 . /etc/rc.subr
 
-name="abi"
-desc="Enable foreign ABIs"
+name="linux"
+desc="Enable Linux ABI"
 start_cmd="${name}_start"
 stop_cmd=":"
 
@@ -18,7 +18,6 @@ linux_start()
 {
 	local _tmpdir
 
-	echo -n ' linux'
 	load_kld -e 'linux(aout|elf)' linux
 	case `sysctl -n hw.machine_arch` in
 	amd64)
@@ -33,21 +32,6 @@ linux_start()
 		fi
 		rm -rf ${_tmpdir}
 	fi
-}
-
-abi_start()
-{
-	local _echostop
-
-	_echostop=
-	if checkyesno linux_enable; then
-		echo -n 'Additional ABI support:'
-		_echostop=yes
-	fi
-
-	checkyesno linux_enable && linux_start
-
-	[ -n "${_echostop}" ] && echo '.'
 }
 
 load_rc_config $name

Modified: head/libexec/rc/rc.d/localpkg
==============================================================================
--- head/libexec/rc/rc.d/localpkg	Wed Oct  2 11:15:35 2019	(r352998)
+++ head/libexec/rc/rc.d/localpkg	Wed Oct  2 11:40:40 2019	(r352999)
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: localpkg
-# REQUIRE: sysvipc abi
+# REQUIRE: sysvipc linux
 # BEFORE:  securelevel
 # KEYWORD: shutdown