From nobody Sun Mar 06 20:22:31 2022 X-Original-To: dev-commits-src-all@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 4B2E319FA70E; Sun, 6 Mar 2022 20:22:32 +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 4KBY141jfrz4tsl; Sun, 6 Mar 2022 20:22:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646598152; 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=aTo1BPyPhBtKoCQibv3Ohf7zbETOT8Siu6XPwg8ThGE=; b=TYCm++O1TmFJ8rhrVKSMbv+0aVztjuGBqfiffZDxJvbZhxKLJlg6R6DVdD2f/5+dqtDAPK M0Nb78IBArJIWPcqR7GEffDv5VeyzBafBYoaJr8d7IrWCKIUZ6kOtA7u8pcVwjHQDnpHN9 FvCQLgL4F8MXJnwjDRJ3mUd2D4u/O7X1Fe+D0pD/JkYAvrbEu4NjiFhPAtLPnh5ckA4lhT 90B2jjpFCGZsMaquFt1g/mAlXuBkp8xH0ApbxS+gagWOrf53iPYKWds2gxDmox1YpgdPgd VMrXUMTWt2oHe9jsFx1M1DQNgYB/QTsbvVNT5t5p4KJp/vMgcN4dPWxcW9c98w== 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 10E061B127; Sun, 6 Mar 2022 20:22:32 +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 226KMVmI088944; Sun, 6 Mar 2022 20:22:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 226KMVYg088942; Sun, 6 Mar 2022 20:22:31 GMT (envelope-from git) Date: Sun, 6 Mar 2022 20:22:31 GMT Message-Id: <202203062022.226KMVYg088942@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: e8baa0024251 - stable/13 - rc.conf: Document zfskeys List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: e8baa0024251e2002f873ff41e5d57eb3dded903 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646598152; 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=aTo1BPyPhBtKoCQibv3Ohf7zbETOT8Siu6XPwg8ThGE=; b=U0rvCtYMQheVFREMH4cr0Q4sujYj5+8WAke50gsx6+EKgouy/uo0KbhfuC5RAGkTD1qCaV i1v+uhIYtBXqB6Sv1zRMLYuJlJr5RXrI8AEWV+akhvKJfmZF16V1xjd+aiWQ7MGkxyBeYH On7F660cQOycYId0AV9b1eN6aDKLKg3aUmuztZni0LAkhHaWxRGFJX7DyuRQQpcR/qmRfr GLZiv3HzcaFJep56UOQzJhfNtXqGBI+wD6YdXsqL3/tLUcTcJgNO3+12VZcfhuWGPSYtAv ivW7lBK9GRagg3/0oSXa1NGNUKAX0n0o4YYPSICMF4jy3rxpMHS+4mcMjQHjwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646598152; a=rsa-sha256; cv=none; b=YZ64FmsNPeuu2Zf6QemxzUP3HTG4/6xAmL57Z3x9oh/7SCLfnUb6bXpkXimGjDU/TbjHVz Cr4wgz/aEnrm0Pz+RY42KhIR7tqNsSKSRg5J0EvdDF1d2CdaBPIEJsuX6tHZRb2vONJ9Xk MPcEX49f5RFzbLoqEClpO/K4ByW4idE5H7cn9Tn8uN98mbsK1Q+qJYzXdDwsmEE/bldW5Y 7gyrmLxKpzCNIE0TcNC790RspQ2kDCY1KdnQZXBWGZv1Ha47YQLGOtdfiRUS+p9ZrBfvkC 1+KXKwD5YG3wkWJ0k+uMnXNq3V9/oPDF3vsoGIuxvNvZzoYvRyJEcwHOeFeGoA== 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=e8baa0024251e2002f873ff41e5d57eb3dded903 commit e8baa0024251e2002f873ff41e5d57eb3dded903 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-03-03 19:03:09 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-03-06 20:21:48 +0000 rc.conf: Document zfskeys Fixes: 33ff39796ffe Add zfskeys rc.d script for auto-loading encryption keys MFC after: 3 days Reviewed by: allanjude Sponsored by: Modirum Sponsored by: Klara, Inc Differential Revision: https://reviews.freebsd.org/D34427 (cherry picked from commit 8719e8a951b78ca555ed777e99d5e2b90f3c4e7b) --- share/man/man5/rc.conf.5 | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index e3b05f75f641..992b5da5ec98 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 18, 2021 +.Dd March 3, 2022 .Dt RC.CONF 5 .Os .Sh NAME @@ -4632,6 +4632,30 @@ If set to .Dq Li YES , and a boot environment marked bootonce is successfully booted, it will be made permanently active. +.It Va zfskeys_enable +.Pq Vt bool +If set to +.Dq Li YES , +enable auto-loading of encryption keys for encrypted ZFS datasets. +For every dataset the script will first load the appropriate encryption key +and the attempt to unlock the dataset. +.Pp +The script operates only on datasets which are encrypted with +ZFS native encryption +and have a ZFS +.Dq Li keylocation +dataset property beginning with +.Dq Li file:// . +.It Va zfskeys_datasets +.Pq Vt str +A whitespace-separated list of ZFS datasets to unlock. +The list is empty by default, +which means that the script will attempt to unlock all datasets. +.It Va zfskeys_timeout +.Pq Vt int +Define the total number of seconds to wait for the zfskeys script +to unlock an encrypted dataset. +The default is 10. .El .Sh FILES .Bl -tag -width ".Pa /etc/defaults/rc.conf" -compact