summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cmd/zfs/zfs_main.c7
-rw-r--r--man/man8/zfs.86
2 files changed, 8 insertions, 5 deletions
diff --git a/cmd/zfs/zfs_main.c b/cmd/zfs/zfs_main.c
index e60ac514d..162cef6fb 100644
--- a/cmd/zfs/zfs_main.c
+++ b/cmd/zfs/zfs_main.c
@@ -353,7 +353,7 @@ get_usage(zfs_help_t idx)
case HELP_HOLD:
return (gettext("\thold [-r] <tag> <snapshot> ...\n"));
case HELP_HOLDS:
- return (gettext("\tholds [-r] <snapshot> ...\n"));
+ return (gettext("\tholds [-rH] <snapshot> ...\n"));
case HELP_RELEASE:
return (gettext("\trelease [-r] <tag> <snapshot> ...\n"));
case HELP_DIFF:
@@ -5961,9 +5961,10 @@ holds_callback(zfs_handle_t *zhp, void *data)
}
/*
- * zfs holds [-r] <snap> ...
+ * zfs holds [-rH] <snap> ...
*
- * -r Recursively hold
+ * -r Lists holds that are set on the named snapshots recursively.
+ * -H Scripted mode; elide headers and separate columns by tabs.
*/
static int
zfs_do_holds(int argc, char **argv)
diff --git a/man/man8/zfs.8 b/man/man8/zfs.8
index e356fc196..02141da71 100644
--- a/man/man8/zfs.8
+++ b/man/man8/zfs.8
@@ -292,7 +292,7 @@
.Ar tag Ar snapshot Ns ...
.Nm
.Cm holds
-.Op Fl r
+.Op Fl rH
.Ar snapshot Ns ...
.Nm
.Cm release
@@ -4294,7 +4294,7 @@ of all descendent file systems.
.It Xo
.Nm
.Cm holds
-.Op Fl r
+.Op Fl rH
.Ar snapshot Ns ...
.Xc
Lists all existing user references for the given snapshot or snapshots.
@@ -4302,6 +4302,8 @@ Lists all existing user references for the given snapshot or snapshots.
.It Fl r
Lists the holds that are set on the named descendent snapshots, in addition to
listing the holds on the named snapshot.
+.It Fl H
+Do not print headers, use tab-delimited output.
.El
.It Xo
.Nm