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. Reviewed by: emaste MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D21615
This commit is contained in:
parent
69cea06f34
commit
c97588b451
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=352836
@ -638,8 +638,6 @@ accounting_enable="NO" # Turn on process accounting (or NO).
|
||||
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.
|
||||
|
@ -107,6 +107,7 @@ CONFS= DAEMON \
|
||||
swaplate \
|
||||
sysctl \
|
||||
syslogd \
|
||||
sysvipc \
|
||||
tmp \
|
||||
ugidfw \
|
||||
${_utx} \
|
||||
|
@ -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.
|
||||
|
@ -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 '.'
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
|
||||
# PROVIDE: localpkg
|
||||
# REQUIRE: abi
|
||||
# REQUIRE: sysvipc abi
|
||||
# BEFORE: securelevel
|
||||
# KEYWORD: shutdown
|
||||
|
||||
|
26
libexec/rc/rc.d/sysvipc
Executable file
26
libexec/rc/rc.d/sysvipc
Executable file
@ -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"
|
Loading…
Reference in New Issue
Block a user