From nobody Wed Apr 06 03:41:12 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 81FB01A8FE0A; Wed, 6 Apr 2022 03:41:13 +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 4KY9KP2Fhkz4qmt; Wed, 6 Apr 2022 03:41:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649216473; 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=Dq3MChmSeOIbAgegGvkh0UjZKB81kQOdMN9nXRC32Co=; b=oHQs7Bk014JweWuo+z3m1gppY+N4T0avn4+S42DepHCacxENTgBNoFramm756pH3ZinhM5 nAgRR4FHlmem6IoOWN7wtU+dS3H2/Atji2e1o8x1mcHOriXdlmQGI7vmfiaeCII0a2uSRq jgweBy7BJ7vGcyKYrwC0UKlU51pA5w181W395QJbgTm2zNissFmGCC/zX3gIs5e3hL4Owq KtoX8EMVcLlZg2kIOePl7rRS41h6zcJ57MOnG/rxDznL0HB/IioKe48pkXBOpUw+xaE6rz 7AQlBwhnGpgxx44KgVbWDehy79t7vd5nU42ulSLeK8gyxPjvgEBWPsgPjKGmYw== 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 EA57913A3C; Wed, 6 Apr 2022 03:41:12 +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 2363fCVG088649; Wed, 6 Apr 2022 03:41:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2363fCNf088648; Wed, 6 Apr 2022 03:41:12 GMT (envelope-from git) Date: Wed, 6 Apr 2022 03:41:12 GMT Message-Id: <202204060341.2363fCNf088648@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: af21459aca19 - stable/12 - bectl: add some discussion about boot environment layouts 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: af21459aca19aa0d4bc35ce367682a41ce42a8bd Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649216473; 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=Dq3MChmSeOIbAgegGvkh0UjZKB81kQOdMN9nXRC32Co=; b=BEQ6j/noc1bHNwGgJWZNzns/5EcxBXK42IcRr4WEhWfreVcyeLtyQB730oQ6Q/ZUg9ymZg MCiazw5Zoqz/I2JRm4ebkrEe7FKzcz/bVOfDbkyFodDAWYdykUwSqPu5X6AXY3evR9JYaw lDveq/FL8TVMLThybsMfhiMTPX6HlcjuToFR9iIo3SNeqviQPMk5psG5q0zNwff3g0Q/0Q uwrPvMMDtYjeYGzc2V8ghBAFLoKWfY47tyA16Eb9cZSAMr3o2eulslY9o3ggjY8BorZkpE eCCVMTbwodKRdnJVFXFyDDaWXJXsZZzve9Oi9lKtCBu08RXdDZ/Hnnr8OFdmHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649216473; a=rsa-sha256; cv=none; b=gAK3bDrQm4g6fmfU1MAB/PQ1HmNPr5VfHxwooHBI3ooZcTOGQ7aP0MRcVIL+dURbhWVDqZ Lhhkz6E1hYotwoVtSkozVaKmMOsSMwAaGlLqoJvntAznlGzCQ+I1g56Bm4EXBwGhf7M2dX fF0zxaAeirOXOXLcgDls2xNDfCx3sbj4Xxj7MpSPnhJ3a2eXSx/eeY6aQVcr+w3BrxoC5+ /2I4Jn0iiOgUW6asYzlp+BOpoZqQibcqasf/U/8GszNbt0XeAo7YuCDdd3Dc3dC2nXPodS PxkcLFUQ1NGajDAna0OMPupfc3lkgKIKXovf1XVl6gWaSLtwcbNZHWXUNOLX1A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=af21459aca19aa0d4bc35ce367682a41ce42a8bd commit af21459aca19aa0d4bc35ce367682a41ce42a8bd Author: Kyle Evans AuthorDate: 2022-03-31 22:41:53 +0000 Commit: Kyle Evans CommitDate: 2022-04-06 03:40:31 +0000 bectl: add some discussion about boot environment layouts Discuss the standard type of layout, as well as the "deep" BE layout, and some of the properties of both. Point the various -r flags at this new section, to help users understand which they're working with and what the -r flag is actually doing. Note that we may just deprecate the -r flag in future versions, but the flag will be recognized as a NOP at that point. (cherry picked from commit c0f846ff235296249271b1235ff6a52b7d23cefb) --- sbin/bectl/bectl.8 | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) diff --git a/sbin/bectl/bectl.8 b/sbin/bectl/bectl.8 index 809a0d2f51a8..ed0029afe78f 100644 --- a/sbin/bectl/bectl.8 +++ b/sbin/bectl/bectl.8 @@ -17,7 +17,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 6, 2021 +.Dd March 31, 2022 .Dt BECTL 8 .Os .Sh NAME @@ -124,6 +124,9 @@ Create a new boot environment named If the .Fl r flag is given, a recursive boot environment will be made. +See +.Sx Boot Environment Structures +for a discussion on different layouts. .Pp If the .Fl e @@ -148,6 +151,9 @@ If the .Fl r flag is given, a recursive snapshot of the boot environment will be created. A snapshot is created for each descendant dataset of the boot environment. +See +.Sx Boot Environment Structures +for a discussion on different layouts. .Pp No new boot environment is created with this command. .It Xo @@ -336,6 +342,90 @@ prints usage information if or .Fl \&? is specified. +.Ss Boot Environment Structures +The traditional +.Fx +boot environment layout, as created by the Auto ZFS option to +.Xr bsdinstall 8 , +is a +.Dq shallow +boot environment structure, where boot environment datasets do not have any +directly subordinate datasets. +Instead, they're organized off in +.Pa zroot/ROOT , +and they rely on datasets elsewhere in the pool having +.Dv canmount +set to +.Dv off . +For instance, a simplified pool may be laid out as such: +.Bd -literal -offset indent +% zfs list -o name,canmount,mountpoint +NAME CANMOUNT MOUNTPOINT +zroot +zroot/ROOT noauto none +zroot/ROOT/default noauto none +zroot/usr off /usr +zroot/usr/home on /usr/home +zroot/var on /var +.Ed +.Pp +In that example, +.Pa zroot/usr +has +.Dv canmount +set to +.Dv off , +thus files in +.Pa /usr +typically fall into the boot environment because this dataset is not mounted. +.Pa zroot/usr/home +is mounted, thus files in +.Pa /usr/home +are not in the boot environment. +.Pp +The other style of boot environments in use, frequently called +.Dq deep boot environments , +organizes some or all of the boot environment as subordinate to the boot +environment dataset. +For example: +.Bd -literal -offset indent +% zfs list -o name,canmount,mountpoint +NAME CANMOUNT MOUNTPOINT +zroot +zroot/ROOT noauto none +zroot/ROOT/default noauto none +zroot/ROOT/default/usr noauto /usr +zroot/ROOT/default/usr/local noauto /usr/local +zroot/var on /var +.Ed +.Pp +Note that the subordinate datasets now have +.Dv canmount +set to +.Dv noauto . +These are more obviously a part of the boot environment, as indicated by their +positioning in the layout. +These subordinate datasets will be mounted by the +.Dv zfsbe +.Xr rc 8 +script at boot time. +In this example, +.Pa /var +is excluded from the boot environment. +.Pp +.Nm +commands that have their own +.Fl r +operate on this second, +.Dq deep +style of boot environment, when the +.Fl r +flag is set. +A future version of +.Nm +may default to handling both styles and deprecate the various +.Fl r +flags. \" .Sh EXAMPLES \" .Bl -bullet \" .It