From owner-svn-src-stable-12@freebsd.org Thu Aug 27 19:35:04 2020 Return-Path: Delivered-To: svn-src-stable-12@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 78A173C1339; Thu, 27 Aug 2020 19:35:04 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BctGw2cDGz4fqJ; Thu, 27 Aug 2020 19:35:04 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 228EA9339; Thu, 27 Aug 2020 19:35:04 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07RJZ4ea080223; Thu, 27 Aug 2020 19:35:04 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07RJZ26L080216; Thu, 27 Aug 2020 19:35:02 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <202008271935.07RJZ26L080216@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Thu, 27 Aug 2020 19:35:02 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r364880 - in stable/12/libexec/rc: . rc.d X-SVN-Group: stable-12 X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: in stable/12/libexec/rc: . rc.d X-SVN-Commit-Revision: 364880 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Aug 2020 19:35:04 -0000 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"