git: 9f00a36010b0 - main - zfsbootcfg.8: list each form in the synopsis and document -d
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 20 Nov 2026 20:47:01 UTC
The branch main has been updated by kevans:
URL: https://cgit.FreeBSD.org/src/commit/?id=9f00a36010b08b7d620433467aba1b100b28b424
commit 9f00a36010b08b7d620433467aba1b100b28b424
Author: Kyle Evans <kevans@FreeBSD.org>
AuthorDate: 2026-11-20 20:46:40 +0000
Commit: Kyle Evans <kevans@FreeBSD.org>
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