Author: trasz
Date: Thu Aug 27 19:35:02 2020
New Revision: 364880
URL: https://svnweb.freebsd.org/changeset/base/364880
Log:
MFC r352836:
Move the SysV IPC stuff out of the 'abi' rc script, into a new one:
'sysvipc' - it has nothing to do with ABIs, and I'd like to later
rename 'abi' to 'linux', which better describes its purpose and also
matches the rcvar name.
Sponsored by: The FreeBSD Foundation
Added:
stable/12/libexec/rc/rc.d/sysvipc
- copied unchanged from r352836, head/libexec/rc/rc.d/sysvipc
Modified:
stable/12/libexec/rc/rc.conf
stable/12/libexec/rc/rc.d/Makefile
stable/12/libexec/rc/rc.d/SERVERS
stable/12/libexec/rc/rc.d/abi
stable/12/libexec/rc/rc.d/localpkg
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/libexec/rc/rc.conf
==============================================================================
--- stable/12/libexec/rc/rc.conf Thu Aug 27 19:15:09 2020
(r364879)
+++ stable/12/libexec/rc/rc.conf Thu Aug 27 19:35:02 2020
(r364880)
@@ -640,8 +640,6 @@ ibcs2_loaders="coff" # List of additional Ibcs2
loader
firstboot_sentinel="/firstboot" # Scripts with "firstboot" keyword are
run if
# this file exists. Should be on a R/W filesystem so
# the file can be deleted after the boot completes.
-
-# Emulation/compatibility services provided by /etc/rc.d/abi
sysvipc_enable="NO" # Load System V IPC primitives at startup (or NO).
linux_enable="NO" # Linux binary compatibility loaded at startup (or NO).
clear_tmp_enable="NO" # Clear /tmp at startup.
Modified: stable/12/libexec/rc/rc.d/Makefile
==============================================================================
--- stable/12/libexec/rc/rc.d/Makefile Thu Aug 27 19:15:09 2020
(r364879)
+++ stable/12/libexec/rc/rc.d/Makefile Thu Aug 27 19:35:02 2020
(r364880)
@@ -111,6 +111,7 @@ CONFS= DAEMON \
swaplate \
sysctl \
syslogd \
+ sysvipc \
tmp \
${_ubthidhci} \
ugidfw \
Modified: stable/12/libexec/rc/rc.d/SERVERS
==============================================================================
--- stable/12/libexec/rc/rc.d/SERVERS Thu Aug 27 19:15:09 2020
(r364879)
+++ stable/12/libexec/rc/rc.d/SERVERS Thu Aug 27 19:35:02 2020
(r364880)
@@ -4,7 +4,7 @@
#
# PROVIDE: SERVERS
-# REQUIRE: mountcritremote abi ldconfig savecore watchdogd
+# REQUIRE: mountcritremote sysvipc abi ldconfig savecore watchdogd
# This is a dummy dependency, for early-start servers relying on
# some basic configuration.
Modified: stable/12/libexec/rc/rc.d/abi
==============================================================================
--- stable/12/libexec/rc/rc.d/abi Thu Aug 27 19:15:09 2020
(r364879)
+++ stable/12/libexec/rc/rc.d/abi Thu Aug 27 19:35:02 2020
(r364880)
@@ -14,14 +14,6 @@ desc="Enable foreign ABIs"
start_cmd="${name}_start"
stop_cmd=":"
-sysv_start()
-{
- echo -n ' sysvipc'
- load_kld sysvmsg
- load_kld sysvsem
- load_kld sysvshm
-}
-
linux_start()
{
local _tmpdir
@@ -48,12 +40,11 @@ abi_start()
local _echostop
_echostop=
- if checkyesno sysvipc_enable || checkyesno linux_enable; then
+ if checkyesno linux_enable; then
echo -n 'Additional ABI support:'
_echostop=yes
fi
- checkyesno sysvipc_enable && sysv_start
checkyesno linux_enable && linux_start
[ -n "${_echostop}" ] && echo '.'
Modified: stable/12/libexec/rc/rc.d/localpkg
==============================================================================
--- stable/12/libexec/rc/rc.d/localpkg Thu Aug 27 19:15:09 2020
(r364879)
+++ stable/12/libexec/rc/rc.d/localpkg Thu Aug 27 19:35:02 2020
(r364880)
@@ -4,7 +4,7 @@
#
# PROVIDE: localpkg
-# REQUIRE: abi
+# REQUIRE: sysvipc abi
# BEFORE: securelevel
# KEYWORD: shutdown
Copied: stable/12/libexec/rc/rc.d/sysvipc (from r352836,
head/libexec/rc/rc.d/sysvipc)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/12/libexec/rc/rc.d/sysvipc Thu Aug 27 19:35:02 2020
(r364880, copy of r352836, head/libexec/rc/rc.d/sysvipc)
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: sysvipc
+# REQUIRE: archdep
+# KEYWORD: nojail
+
+. /etc/rc.subr
+
+name="sysvipc"
+desc="Load SysV IPC modules"
+rcvar="sysvipc_enable"
+start_cmd="${name}_start"
+stop_cmd=":"
+
+sysvipc_start()
+{
+ load_kld sysvmsg
+ load_kld sysvsem
+ load_kld sysvshm
+}
+
+load_rc_config $name
+run_rc_command "$1"
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
