From owner-svn-src-all@freebsd.org Thu Aug 27 19:37:29 2020 Return-Path: Delivered-To: svn-src-all@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 7E1223C1799; Thu, 27 Aug 2020 19:37:29 +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 4BctKj2jgtz4fwy; Thu, 27 Aug 2020 19:37:29 +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 28D4F93DF; Thu, 27 Aug 2020 19:37:29 +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 07RJbTpg080541; Thu, 27 Aug 2020 19:37:29 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07RJbS7o080538; Thu, 27 Aug 2020 19:37:28 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <202008271937.07RJbS7o080538@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:37:28 +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: r364881 - stable/12/libexec/rc/rc.d X-SVN-Group: stable-12 X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: stable/12/libexec/rc/rc.d X-SVN-Commit-Revision: 364881 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Aug 2020 19:37:29 -0000 Author: trasz Date: Thu Aug 27 19:37:28 2020 New Revision: 364881 URL: https://svnweb.freebsd.org/changeset/base/364881 Log: MFC r352999: Rename etc/rc.d/abi to etc/rc.d/linux; after moving out the SysV IPC stuff it's entirely linux-specific. MFC r353054: Add rcvar back to the linux rc script. Without it it was enabled unconditionally. Sponsored by: The FreeBSD Foundation Added: stable/12/libexec/rc/rc.d/linux - copied, changed from r352999, head/libexec/rc/rc.d/linux Deleted: stable/12/libexec/rc/rc.d/abi Modified: stable/12/libexec/rc/rc.d/Makefile stable/12/libexec/rc/rc.d/SERVERS stable/12/libexec/rc/rc.d/localpkg Directory Properties: stable/12/ (props changed) Modified: stable/12/libexec/rc/rc.d/Makefile ============================================================================== --- stable/12/libexec/rc/rc.d/Makefile Thu Aug 27 19:35:02 2020 (r364880) +++ stable/12/libexec/rc/rc.d/Makefile Thu Aug 27 19:37:28 2020 (r364881) @@ -11,7 +11,6 @@ CONFS= DAEMON \ LOGIN \ NETWORKING \ SERVERS \ - abi \ addswap \ adjkerntz \ archdep \ @@ -54,6 +53,7 @@ CONFS= DAEMON \ kldxref \ ${_kpasswdd} \ ldconfig \ + linux \ local \ localpkg \ lockd \ Modified: stable/12/libexec/rc/rc.d/SERVERS ============================================================================== --- stable/12/libexec/rc/rc.d/SERVERS Thu Aug 27 19:35:02 2020 (r364880) +++ stable/12/libexec/rc/rc.d/SERVERS Thu Aug 27 19:37:28 2020 (r364881) @@ -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: stable/12/libexec/rc/rc.d/linux (from r352999, head/libexec/rc/rc.d/linux) ============================================================================== --- head/libexec/rc/rc.d/linux Wed Oct 2 11:40:40 2019 (r352999, copy source) +++ stable/12/libexec/rc/rc.d/linux Thu Aug 27 19:37:28 2020 (r364881) @@ -11,6 +11,7 @@ name="linux" desc="Enable Linux ABI" +rcvar="linux_enable" start_cmd="${name}_start" stop_cmd=":" Modified: stable/12/libexec/rc/rc.d/localpkg ============================================================================== --- stable/12/libexec/rc/rc.d/localpkg Thu Aug 27 19:35:02 2020 (r364880) +++ stable/12/libexec/rc/rc.d/localpkg Thu Aug 27 19:37:28 2020 (r364881) @@ -4,7 +4,7 @@ # # PROVIDE: localpkg -# REQUIRE: sysvipc abi +# REQUIRE: sysvipc linux # BEFORE: securelevel # KEYWORD: shutdown