From nobody Fri Dec 3 01:06:54 2021 X-Original-To: dev-commits-src-main@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 11C1E18BD523; Fri, 3 Dec 2021 01:06:55 +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 4J4vmZ5nMnz3QGc; Fri, 3 Dec 2021 01:06:54 +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 A2D3A27661; Fri, 3 Dec 2021 01:06:54 +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 1B316sLr076591; Fri, 3 Dec 2021 01:06:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B316svs076590; Fri, 3 Dec 2021 01:06:54 GMT (envelope-from git) Date: Fri, 3 Dec 2021 01:06:54 GMT Message-Id: <202112030106.1B316svs076590@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: a58135eb0927 - main - OptionalObsoleteFiles.inc: Add rc.d/zfskeys List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: a58135eb092748caf383bc82306af522ff311d9d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638493614; 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=LNcwyM98XL4pLcFuf5nJPvHvjtaZE1dLb3Tpc88hMZM=; b=WLyo/z9IIJ1LuOaFedMoicn/51VeDwVs5iBRg+hOjS3I7CQNAokWVpNyjg9g6wISG/gzfg Uq+JDMEABlAIFMYyLn+9+GvCYgWviQi7kgzQOXFoTraO/cFXZ5NN4nc7ANMyuKFrvNecAT cts5X42CQwD2vKyxIdoTWlwJpA+K70BbSieya/57YcUGqkFpxfmiz7bXF3KXHiC24nLa4s f8bdcqY6Y8VakIafJ//jbpkzGLHhsu6UUAH0xwI0Xh6uXOFKHKgpQSdktfoh5Xfm08AQX8 JrnVbursXmW/wAekTGbN+Eg0uMxk9dB73plE4MUiMaVccb2uGGtDMEKYy8an1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638493614; a=rsa-sha256; cv=none; b=EiVZViNoUSQ181kC3qMvEb+RhJUKnGsvcVZ0deFW0FqAr+GdwUxyVXUKVwyZzMZDUN8J6y xWSO8lCyc59oRX22X9o3npVe2IZmh+tY1RRa5frBlJ2juOPMToNuF7uYyXLbTBVbaOTvFN k3oPKVRO98MgaIMDO/dqQ9iKPUSIJoojrocvqi4PCHqIh4iVkiIIlsY29tsOjsipbSi/Bk UKFV2S4Yci625qP4SNVveNpCRr7lsS5xtOFstqO5ycbtUiY9MPSDKDNp2QtkfmA2rOaUKo CqM1kMiQt/ZurmpQV3FlfOSl5wYaiD6dszNiMzsqhEDgBJzO+MePomqz3MQK6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by 0mp (doc, ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=a58135eb092748caf383bc82306af522ff311d9d commit a58135eb092748caf383bc82306af522ff311d9d Author: Herbert J. Skuhra AuthorDate: 2021-12-03 00:44:55 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2021-12-03 01:05:55 +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 --- 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 e6b1b1909771..02406a3c43e2 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -1118,8 +1118,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