From nobody Mon Dec 6 09:57:28 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 8EE5218D6C13; Mon, 6 Dec 2021 09:57:28 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J6zPN239Mz4fv1; Mon, 6 Dec 2021 09:57:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 261E613E9; Mon, 6 Dec 2021 09:57:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1B69vSfb046235; Mon, 6 Dec 2021 09:57:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B69vSUh046234; Mon, 6 Dec 2021 09:57:28 GMT (envelope-from git) Date: Mon, 6 Dec 2021 09:57:28 GMT Message-Id: <202112060957.1B69vSUh046234@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 4a10f984d8e5 - stable/13 - OptionalObsoleteFiles.inc: Add rc.d/zfskeys List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4a10f984d8e54d5115574d1ed354264921dfb2d3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638784648; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Y0XDF9WxaXVIGyXa5O08ehoGEPjU+roxqFuC7dEAr1U=; b=lMoFY2dR325rhONFsNuQ0OP3cSKQ2L34dqEgdXYLP5ZEzDTrb8CKomtLehJy5RSasK9ygU uHvoeB6X1aWfrEL91FudfE0RCZVN7r5UJmaycMefTZalAbbqU9NbaqGBT7oxJReSWin9eI AQ3cHwIuebFsYmCqPourWUXboKACznW+1G8Tbh4FXBRHM8VaqPUvHsEBlQRVBWck2NK1sx Ryt/AKOvI7um760JVP/8vVqx8IlPfO0D7rlRdmvhC584bkxvdqaDJmNP6ZJffetONDC4UW 644vjTzSW0eeVMcC/dz6O8oRUK+YgALaSjOU62TRK3lTYSAiRtUsmLnGr9oOAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638784648; a=rsa-sha256; cv=none; b=bs+D92vW7HaIpinruU979ln/09b2wQPGW2N6wl8QsSw6PQ21xpNAIEYvyhs0qnLOCn+fpR B37Yf9Z2+QYt2vNKTcN4mD6ENY8vrLt/A1ErAQHLB20Uwkz8aZwvUgbSy8VkZXL5oeC83h wqEpjaRcK8V0SI5HqKM4G1adNAUpkr6JdtS0K81DtKYxzD2E+XzY82fAsi+U9phjLpZZRI A3J8XzTON7/+uijeFK/pgA2/LvwwYsH5Sk3nhtGCNGdWiDPKKH8h7uVWjKBtNwJjlVmDtd 5FEhfHh7oXk/sFcn3Jm/Ht/eGN6IIne+g0QsNoa9SaT0iTL1vfuLcxZKtnSTLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by 0mp (doc, ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=4a10f984d8e54d5115574d1ed354264921dfb2d3 commit 4a10f984d8e54d5115574d1ed354264921dfb2d3 Author: Herbert J. Skuhra AuthorDate: 2021-12-03 00:44:55 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-12-06 09:56:28 +0000 OptionalObsoleteFiles.inc: Add rc.d/zfskeys While here, sort the etc/rc.d entries. PR: 256483 Reviewed by: allanjude Approved by: allanjude (src) MFC after: 3 days Sponsored by: Modirum MDPay Sponsored by: Klara Inc. Differential Revision: https://reviews.freebsd.org/D33238 (cherry picked from commit a58135eb092748caf383bc82306af522ff311d9d) --- tools/build/mk/OptionalObsoleteFiles.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index ea42479a2d69..26a3861f736a 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1120,8 +1120,9 @@ OLD_FILES+=boot/gptzfsboot OLD_FILES+=boot/zfsboot OLD_FILES+=boot/zfsloader OLD_FILES+=etc/rc.d/zfs -OLD_FILES+=etc/rc.d/zfsd OLD_FILES+=etc/rc.d/zfsbe +OLD_FILES+=etc/rc.d/zfsd +OLD_FILES+=etc/rc.d/zfskeys OLD_FILES+=etc/rc.d/zvol OLD_FILES+=etc/devd/zfs.conf OLD_FILES+=etc/periodic/daily/404.status-zfs