From nobody Thu Feb 24 13:47:40 2022 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 D584F19E7617; Thu, 24 Feb 2022 13:47:40 +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 4K4Dk45dtvz4cT3; Thu, 24 Feb 2022 13:47:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645710460; 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=w21n0akFUbu4oHuYeo2B1YKlO/QH44TDz2/4B9GPJ2k=; b=X6ONXGFLYvED4IgmI2db1otweUXigoL2gQ7cwh0U1PU9CZ26NhfOjksODEFBqr8prgMDNm B8lQ+cZNbrnNGLrFmu8Isy2G4kbTX5DRufHxEACBbI/qHbH5GaVK/ziAbGf5tx62Sn1y9U 3ie4Enic77pPXgkfH5nYdQnewBMbkyQmLAXgsAkmyUArp6hZ0mD6JRD5pNLdOx7oZeZtyB lrzrOecNk4T/RPMpZcJ4oF5h43dIaAPKkiLw1+1uU0ScBbRiBn/aqTA7w19yntIMsSRXf1 i3AJBn0CjpDWtBxvX4B9HP8OKFdKnDo6c2+Z6UIKYnL4IAnLJcCm6pQqBpWvEA== 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 A232F4DE7; Thu, 24 Feb 2022 13:47:40 +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 21ODleuv097342; Thu, 24 Feb 2022 13:47:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21ODleZm097341; Thu, 24 Feb 2022 13:47:40 GMT (envelope-from git) Date: Thu, 24 Feb 2022 13:47:40 GMT Message-Id: <202202241347.21ODleZm097341@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: d639807e7798 - stable/12 - freebsd-update.8: Document CreateBootEnv 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/12 X-Git-Reftype: branch X-Git-Commit: d639807e77987dd304560da7bbb06e1ffb40db4a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645710460; 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=w21n0akFUbu4oHuYeo2B1YKlO/QH44TDz2/4B9GPJ2k=; b=J9SrlCDN/iIvgnOAsLecu4jLxMA8ZI/zhOobabRuMpncAaIYceChjiZ/7cSDGCb35Le+fN 3fGG5XM3JXuqovYIxUWlBMTz+xwtBWxZkxJRDGXm2nDuHxfwaJ6+HbXrXqHNV04gqQfCp6 YMmcclib7FnKe9BOQxB8nEeh7vsi/2XAJXtnjXZ1mBzzkQGDNecACtUw8CU+bHtjq4q4/1 Adz2Z9bRn7PGJ57f8yC2aqaPkIYCRgU2BNc0JkeS2j3eFQP9dvfQb8W0oIenwGf+pS3uq4 OlyXK2hL8Miuvfg+FgJjDPUmQibmReZCOfAauJ56R18ZpBvn9rMfKlvT6NWvyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645710460; a=rsa-sha256; cv=none; b=UKAFOviDVIFa2U0rcqZ1GtdCnwNpD++0aPWEfrjbd37mJjIQ39xhxIDCR1XObrpnA9OisD vafrQ+GjtjhPrwQiJ7TGRPcIyigLdzElcIKHaGjco+/V39Tmp9hTzJXOIa8tpdLFNe/m31 qw0NOpQKh652w45upXc9TeaNAiabR0VNQA27LnI0DQU69QJgeC3/ErKlcCVVEODW2vxBFv ISLR8yhyNuGk79CtA64PfgnDqMWqVqK9ShUgzNza+xpcBw6XALEigqo29nWEcjNkphChfJ qtEqXRvFKnqGpLUbPpnbP28JZroeO8GLUGY5SPEKqGJlM6xdwEP9P3sXJyJxVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by 0mp (doc, ports committer): URL: https://cgit.FreeBSD.org/src/commit/?id=d639807e77987dd304560da7bbb06e1ffb40db4a commit d639807e77987dd304560da7bbb06e1ffb40db4a Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2022-02-04 10:20:49 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2022-02-24 13:47:16 +0000 freebsd-update.8: Document CreateBootEnv Also, add bectl(8) to section "See Also". [1] PR: 261716 Reviewed by: debdrup, pauamma_gundo.com MFC after: 1 week Fixes: f28f13890541 freebsd-update: create a ZFS boot environment on install Differential Revision: https://reviews.freebsd.org/D34169 Co-authored-by: Tobias Rehbein [1] (cherry picked from commit 6d17f2d04302af6408127b9f8a307e2977c6d086) --- share/man/man5/freebsd-update.conf.5 | 56 +++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/share/man/man5/freebsd-update.conf.5 b/share/man/man5/freebsd-update.conf.5 index 498fa15e685f..9d33e9e25171 100644 --- a/share/man/man5/freebsd-update.conf.5 +++ b/share/man/man5/freebsd-update.conf.5 @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 19, 2009 +.Dd February 17, 2022 .Dt FREEBSD-UPDATE.CONF 5 .Os FreeBSD .Sh NAME @@ -218,6 +218,59 @@ backup kernel, the .Cm freebsd-update rollback command will recreate the symbol files along with the old kernel. +.It Cm CreateBootEnv +The single parameter following this keyword must be +.Dq yes +or +.Dq no +and specifies whether +.Cm freebsd-update +will create a new boot environment using +.Xr bectl 8 +when installing patches. +.Pp +The name of the new boot environment consists of the current +.Fx +version: +.Bd -literal -offset indent +freebsd-version -ku | sort -V | tail -n 1 +.Ed +.Pp +and a timestamp: +.Bd -literal -offset indent +date +"%Y-%m-%d_%H%M%S" +.Ed +.Pp +separated by a single dash, e.g.: +.Bd -literal -offset indent +13.0-RELEASE-p7_2022-02-16_141502 +.Ed +.Pp +.Cm freebsd-update +does not attempt to create a boot environment +if any of the following applies: +.Pp +.Bl -dash -compact +.It +ZFS is not used. +.It +The ZFS root is not set up for boot environments +.Po see the check command of +.Xr bectl 8 +for details +.Pc . +.It +.Cm freebsd-update +is running in a +.Xr jail 8 . +.It +.Cm freebsd-update +is updating a root directory selected via +the basedir +.Pq Fl b +or jail +.Pq Fl j +flags. .El .Sh FILES .Bl -tag -width "/etc/freebsd-update.conf" @@ -228,6 +281,7 @@ configuration file. .El .Sh SEE ALSO .Xr sha256 1 , +.Xr bectl 8 , .Xr freebsd-update 8 .Sh AUTHORS .An Colin Percival Aq Mt cperciva@FreeBSD.org