From nobody Thu Mar 03 19:14:34 2022 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 CAC4619FB4C1; Thu, 3 Mar 2022 19:14:34 +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 4K8gf25Lbtz4scn; Thu, 3 Mar 2022 19:14:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646334874; 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=43voZ+kva2plr9hRKHx7sOuSkd5bCCSUbKJobJsyzHM=; b=vRukbB70SlOtWwueDJZp4P04KB2xNHrGK3yS3qfvNakRGGGKry8vk1ZZMXWP0sT+6aIY0q zPREQvgkB9AIe71qthAaNb6hWRXjHBR3nal/Y5VHFnQeq8B3jL9LwqOH1MgVG31SHB+QUK JNgNinga+8bs2WLHjfDlQiOrY9JWC79SI21kAm8UtOy0zb5G7o7pUf64tok+Me4ccdyYdg j2rNgO8s76DQUv9YogirUwnw7sXcRPRv9y+lTDs2eNwdkQtxh+WDxNQ2l+BMiuBNKkMca4 EUDH/knfU+XJfzFcOu6eJVg89hfunV01wgD5dMus05if7o3VUcxF/VW/exWzjA== 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 977C71D988; Thu, 3 Mar 2022 19:14:34 +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 223JEYHW091069; Thu, 3 Mar 2022 19:14:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 223JEYVj091068; Thu, 3 Mar 2022 19:14:34 GMT (envelope-from git) Date: Thu, 3 Mar 2022 19:14:34 GMT Message-Id: <202203031914.223JEYVj091068@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: 8719e8a951b7 - main - rc.conf: Document 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: 8719e8a951b78ca555ed777e99d5e2b90f3c4e7b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646334874; 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=43voZ+kva2plr9hRKHx7sOuSkd5bCCSUbKJobJsyzHM=; b=U/EzE1v7s2/Kv9PMHXUV/LMo9mWmvYgbN440ocnVRihcu+b9jJ7y5GBnank7PUlg6Fciqg v/sHR3OkCQVpqdmTefpyfceDbrDHwvpIeD4dNSGdcu71mKmZzGEMPXGntbhZMPssg9d56J VvgvAIKkxwZS3R/FAXfa316PnI3eL0YvInioNHFKAA4RDSObUds44XFkPB7M8IWFMI/6yb +nLfKOvm63lQwvd65BTSazJjL7XQECsoC/KtbscLGKDNj2CkRA6a8hGAme5ACsu3zliXpD XUo1SE6u8i9woGfy5M5jdygmOcaQFneubvmH0wR0uBBTC5YGCA6PzC1ZPn35IQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646334874; a=rsa-sha256; cv=none; b=F7FJosHPcl3ZnHjzwtipK5XPtDNAdVlejKLCoHSW6Qcln7jKCUC1G5jNf18r2Y6f2YnC3i nYU0Z3z3Ayq4y+LGMP1+Ot9Ze+hwrsoQUaZNy2ssCAJzNEKr+zDkphNd8vu+fB5Rii7SH0 SO1Na3+UNhlfUpINP14Z8BNbYBsSQTQrHGCHa6c2B6Aaim0RcPYn7CFfTSU10iSZvdALrm Sq/C6jpXEdLhpW3uZSzHawrzvr5gBUOvrGeuA3oiE3J0TC+4Dqb3GcXNdoSi4NMvPm8Ro2 L4IkqC3cV4cpaThmSu+hbx+tYa4L3mfUM/6C8SOouGsml+uUjerQ0R7+NZ79ww== 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=8719e8a951b78ca555ed777e99d5e2b90f3c4e7b commit 8719e8a951b78ca555ed777e99d5e2b90f3c4e7b Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-03-03 19:03:09 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-03-03 19:14:14 +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 --- 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 2f124dd1cf3c..248864bb5ad8 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 30, 2021 +.Dd March 3, 2022 .Dt RC.CONF 5 .Os .Sh NAME @@ -4641,6 +4641,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