From owner-svn-src-all@freebsd.org Wed Oct 2 11:40:42 2019 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 0D64612C32B; Wed, 2 Oct 2019 11:40:42 +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) server-signature RSA-PSS (4096 bits) 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 46jvMs6cgdz4J6R; Wed, 2 Oct 2019 11:40:41 +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 AE74A2AE4B; Wed, 2 Oct 2019 11:40:41 +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 x92BefiN083267; Wed, 2 Oct 2019 11:40:41 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x92BeeIl083263; Wed, 2 Oct 2019 11:40:40 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201910021140.x92BeeIl083263@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Wed, 2 Oct 2019 11:40:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r352999 - head/libexec/rc/rc.d X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: head/libexec/rc/rc.d X-SVN-Commit-Revision: 352999 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.29 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: Wed, 02 Oct 2019 11:40:42 -0000 Author: trasz Date: Wed Oct 2 11:40:40 2019 New Revision: 352999 URL: https://svnweb.freebsd.org/changeset/base/352999 Log: Rename etc/rc.d/abi to etc/rc.d/linux; after moving out the SysV IPC stuff it's entirely linux-specific. Reviewed by: emaste MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D21830 Added: head/libexec/rc/rc.d/linux - copied, changed from r352839, head/libexec/rc/rc.d/abi Deleted: head/libexec/rc/rc.d/abi Modified: head/libexec/rc/rc.d/Makefile head/libexec/rc/rc.d/SERVERS head/libexec/rc/rc.d/localpkg Modified: head/libexec/rc/rc.d/Makefile ============================================================================== --- head/libexec/rc/rc.d/Makefile Wed Oct 2 11:15:35 2019 (r352998) +++ head/libexec/rc/rc.d/Makefile Wed Oct 2 11:40:40 2019 (r352999) @@ -11,7 +11,6 @@ CONFS= DAEMON \ LOGIN \ NETWORKING \ SERVERS \ - abi \ addswap \ adjkerntz \ archdep \ @@ -51,6 +50,7 @@ CONFS= DAEMON \ kldxref \ ${_kpasswdd} \ ldconfig \ + linux \ local \ localpkg \ lockd \ Modified: head/libexec/rc/rc.d/SERVERS ============================================================================== --- head/libexec/rc/rc.d/SERVERS Wed Oct 2 11:15:35 2019 (r352998) +++ head/libexec/rc/rc.d/SERVERS Wed Oct 2 11:40:40 2019 (r352999) @@ -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: head/libexec/rc/rc.d/linux (from r352839, head/libexec/rc/rc.d/abi) ============================================================================== --- head/libexec/rc/rc.d/abi Sat Sep 28 09:50:01 2019 (r352839, copy source) +++ head/libexec/rc/rc.d/linux Wed Oct 2 11:40:40 2019 (r352999) @@ -3,14 +3,14 @@ # $FreeBSD$ # -# PROVIDE: abi +# PROVIDE: linux # REQUIRE: archdep # KEYWORD: nojail . /etc/rc.subr -name="abi" -desc="Enable foreign ABIs" +name="linux" +desc="Enable Linux ABI" start_cmd="${name}_start" stop_cmd=":" @@ -18,7 +18,6 @@ linux_start() { local _tmpdir - echo -n ' linux' load_kld -e 'linux(aout|elf)' linux case `sysctl -n hw.machine_arch` in amd64) @@ -33,21 +32,6 @@ linux_start() fi rm -rf ${_tmpdir} fi -} - -abi_start() -{ - local _echostop - - _echostop= - if checkyesno linux_enable; then - echo -n 'Additional ABI support:' - _echostop=yes - fi - - checkyesno linux_enable && linux_start - - [ -n "${_echostop}" ] && echo '.' } load_rc_config $name Modified: head/libexec/rc/rc.d/localpkg ============================================================================== --- head/libexec/rc/rc.d/localpkg Wed Oct 2 11:15:35 2019 (r352998) +++ head/libexec/rc/rc.d/localpkg Wed Oct 2 11:40:40 2019 (r352999) @@ -4,7 +4,7 @@ # # PROVIDE: localpkg -# REQUIRE: sysvipc abi +# REQUIRE: sysvipc linux # BEFORE: securelevel # KEYWORD: shutdown