Page MenuHomeFreeBSD
Files F177594440

D21615.1794812500.diff
No OneTemporary
Actions

Authored By
Unknown
Size
3 KB
Referenced Files
None
Subscribers
None

D21615.1794812500.diff
View Options

Index: libexec/rc/rc.conf
===================================================================
--- libexec/rc/rc.conf
+++ libexec/rc/rc.conf
@@ -638,8 +638,6 @@
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.
Index: libexec/rc/rc.d/Makefile
===================================================================
--- libexec/rc/rc.d/Makefile
+++ libexec/rc/rc.d/Makefile
@@ -107,6 +107,7 @@
swaplate \
sysctl \
syslogd \
+ sysvipc \
tmp \
ugidfw \
${_utx} \
Index: libexec/rc/rc.d/SERVERS
===================================================================
--- libexec/rc/rc.d/SERVERS
+++ libexec/rc/rc.d/SERVERS
@@ -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.
Index: libexec/rc/rc.d/abi
===================================================================
--- libexec/rc/rc.d/abi
+++ libexec/rc/rc.d/abi
@@ -14,14 +14,6 @@
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 @@
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 '.'
Index: libexec/rc/rc.d/localpkg
===================================================================
--- libexec/rc/rc.d/localpkg
+++ libexec/rc/rc.d/localpkg
@@ -4,7 +4,7 @@
#
# PROVIDE: localpkg
-# REQUIRE: abi
+# REQUIRE: sysvipc abi
# BEFORE: securelevel
# KEYWORD: shutdown
Index: libexec/rc/rc.d/sysvipc
===================================================================
--- libexec/rc/rc.d/sysvipc
+++ libexec/rc/rc.d/sysvipc
@@ -1,62 +1,25 @@
#!/bin/sh
#
-# $FreeBSD: head/libexec/rc/rc.d/abi 346072 2019-04-10 07:51:13Z crees $
+# $FreeBSD: head/libexec/rc/rc.d/sysvipc 346072 2019-04-10 07:51:13Z crees $
#
-# PROVIDE: abi
+# PROVIDE: sysvipc
# REQUIRE: archdep
# KEYWORD: nojail
. /etc/rc.subr
-name="abi"
-desc="Enable foreign ABIs"
+name="sysvipc"
+desc="Load SysV IPC modules"
+rcvar="sysvipc_enable"
start_cmd="${name}_start"
stop_cmd=":"
-sysv_start()
+sysvipc_start()
{
- echo -n ' sysvipc'
load_kld sysvmsg
load_kld sysvsem
load_kld sysvshm
-}
-
-linux_start()
-{
- local _tmpdir
-
- echo -n ' linux'
- load_kld -e 'linux(aout|elf)' linux
- case `sysctl -n hw.machine_arch` in
- amd64)
- load_kld -e 'linux64elf' linux64
- ;;
- esac
- if [ -x /compat/linux/sbin/ldconfigDisabled ]; then
- _tmpdir=`mktemp -d -t linux-ldconfig`
- /compat/linux/sbin/ldconfig -C ${_tmpdir}/ld.so.cache
- if ! cmp -s ${_tmpdir}/ld.so.cache /compat/linux/etc/ld.so.cache; then
- cat ${_tmpdir}/ld.so.cache > /compat/linux/etc/ld.so.cache
- fi
- rm -rf ${_tmpdir}
- fi
-}
-
-abi_start()
-{
- local _echostop
-
- _echostop=
- if checkyesno sysvipc_enable || 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 '.'
}
load_rc_config $name

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 16, 7:01 AM (22 h, 20 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41765907
Default Alt Text
D21615.1794812500.diff (3 KB)

Event Timeline