From nobody Fri Nov 20 20:47:01 2026 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 4jWS7T6jqBz6w3S9 for ; Fri, 20 Nov 2026 20:47:01 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jWS7T5l0lz4KPK for ; Fri, 20 Nov 2026 20:47:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795207621; 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=cThSiiyE1PlFPWT5lcHSMI9RhFK676qu91efG/jU/1A=; b=jBc4BhntzVwkGh/sL9CdlMkMtDPt/fREJ+yppvFc9TFrdpYJD7cZp6YGEkxLuh9w+6Aggx jqQ+MwyEBn2bv2kAdM1vjnZvhfjaM5gIQTJ5DJJ2gogBETbTBv0ATQhUnGhesxw/9OO1wn vt/HjBpTqJ77UgKJnqQDaqZo6VzLzpm6H3ugCA7pz20heGN/lvqOBoueopbE4N4lYZj6PS tzJz+Gm5wRzgZ5lAb0P77ZcWjO7IYr65718Gvk7KOzV03gFU/q1by6dqPxFdo7Pv0Qy8pr wEdufRNvBYl0NFvEpsNdN957dagZoLg43VsG5kikw/zkqicUQPgYHcrVcuOZlg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795207621; b=JpY1VD9zvptgLV55HAQ4QxKN2aJwKudsnBMDdEwjSKLJfphaQWbIEpfqGYV5JSWwNUBQoB w11yZ/tbQzjqCf8qvJnQ933FPp7tatS2+L9ObfPww4qJocbunV0dE90G7AwcaMTvBfo673 lmyHMJXMkjml75PioCe3mD9uCMDY2k0nAcjif65pa9agmWYJlUEJm6i0Ez0zXQnoUrFnlV WxRZzL1RYKkma7JXt2JLLQTP6h0+dr89BtRDxeKc4RrqT7fCQnjy4bIR7EMgZJTO2d8i2D FuhlEduHrEVS9TG37EP0FLuKo07qkYZ+C+iBfODR4npdusH3Q4iqagpD2JF9wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795207621; 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=cThSiiyE1PlFPWT5lcHSMI9RhFK676qu91efG/jU/1A=; b=pbfnKahV6xSMQzPJh6isO6mwbUvDyQifaCpkwvwh280lVsfSSrEsoEeovtjKLmLJo+gYrW cSoRH+aw7rRqxRROdj+UOJi3T1zaMyoYcwQZrbBs5JVMftXKOa9KFMq8m8hQRToWdEg3B6 VYOEIxPvUGTFz67bNrE+XlnM5iB7IQY2Ma73qL9jMF+8VzTFLSFagDbcD6oyXdlOYqPpw7 JyDnN2pXwDmILsHK5Ve33AyNwD/xmvvbUvopb5rQj712gDKWI6pTHG4zCixt2fVU8/zrn6 vZAYIfHcxZ+QAQV2IWmIsJ58Efg4dPfxH363uYQQIM1GOi4YuwsL/rZescFGZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jWS7T5PlGz14Rd for ; Fri, 20 Nov 2026 20:47:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 13729 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 20 Nov 2026 20:47:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 9f00a36010b0 - main - zfsbootcfg.8: list each form in the synopsis and document -d List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/main X-Git-Reftype: branch X-Git-Commit: 9f00a36010b08b7d620433467aba1b100b28b424 Auto-Submitted: auto-generated Date: Fri, 20 Nov 2026 20:47:01 +0000 Message-Id: <6b00b1c5.13729.19d9b222@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=9f00a36010b08b7d620433467aba1b100b28b424 commit 9f00a36010b08b7d620433467aba1b100b28b424 Author: Kyle Evans AuthorDate: 2026-11-20 20:46:40 +0000 Commit: Kyle Evans CommitDate: 2026-11-20 20:46:40 +0000 zfsbootcfg.8: list each form in the synopsis and document -d The synopsis listed every option as optional in a single form, which doesn't show that -k needs -v, and it didn't mention -d at all. List the distinct forms instead: setting boot.config(5) options (or printing them, with none), setting or deleting a key, and printing the bootenv area. Document -d alongside the other options. Reviewed by: avg, bcr Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D61834 --- sbin/zfsbootcfg/zfsbootcfg.8 | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/sbin/zfsbootcfg/zfsbootcfg.8 b/sbin/zfsbootcfg/zfsbootcfg.8 index 3831adfc81bd..33072ec94576 100644 --- a/sbin/zfsbootcfg/zfsbootcfg.8 +++ b/sbin/zfsbootcfg/zfsbootcfg.8 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd July 28, 2025 +.Dd November 20, 2026 .Dt ZFSBOOTCFG 8 .Os .Sh NAME @@ -30,15 +30,24 @@ .Nd "specify zfsboot options for the next boot" .Sh SYNOPSIS .Nm -.Ao Ar options Ac +.Op Fl z Ar pool +.Op Ar options .Nm +.Op Fl z Ar pool .Op Fl n Ar name -.Op Fl k Ar key -.Op Fl p +.Fl k Ar key .Op Fl t Ar type -.Op Fl v Ar value +.Fl v Ar value +.Op Fl p +.Nm .Op Fl z Ar pool +.Op Fl n Ar name +.Fl d Ar key +.Op Fl p .Nm +.Op Fl z Ar pool +.Op Fl n Ar name +.Fl p .Sh DESCRIPTION .Nm is used to set @@ -64,6 +73,11 @@ will output the current boot configuration, if set. The following options are supported by .Nm : .Bl -tag -width indent +.It Fl d Ar key +Delete the +.Ao key , value Ac +pair for +.Ar key . .It Fl k Ar key Define key for .Ao key , value Ac