Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

'zfs holds' scripted mode is not documented 

This change simply documents the existing "scripted mode" option in
both command help and man page.

Reviewed-by: Giuseppe Di Natale <guss80@gmail.com>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
Closes #7798
This commit is contained in:
LOLi 2018-08-19 00:47:41 +02:00 committed by Brian Behlendorf
parent 1f87313ac8
commit a9d6270acb
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/zfs/zfs_main.c
View File

@ -353,7 +353,7 @@ get_usage(zfs_help_t idx)
case HELP_HOLD: case HELP_HOLD:
return (gettext("\thold [-r] <tag> <snapshot> ...\n")); return (gettext("\thold [-r] <tag> <snapshot> ...\n"));
case HELP_HOLDS: case HELP_HOLDS:
return (gettext("\tholds [-r] <snapshot> ...\n")); return (gettext("\tholds [-rH] <snapshot> ...\n"));
case HELP_RELEASE: case HELP_RELEASE:
return (gettext("\trelease [-r] <tag> <snapshot> ...\n")); return (gettext("\trelease [-r] <tag> <snapshot> ...\n"));
case HELP_DIFF: 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 static int
zfs_do_holds(int argc, char **argv) zfs_do_holds(int argc, char **argv)

6
man/man8/zfs.8
View File

@ -292,7 +292,7 @@
.Ar tag Ar snapshot Ns ... .Ar tag Ar snapshot Ns ...
.Nm .Nm
.Cm holds .Cm holds
.Op Fl r .Op Fl rH
.Ar snapshot Ns ... .Ar snapshot Ns ...
.Nm .Nm
.Cm release .Cm release
@ -4294,7 +4294,7 @@ of all descendent file systems.
.It Xo .It Xo
.Nm .Nm
.Cm holds .Cm holds
.Op Fl r .Op Fl rH
.Ar snapshot Ns ... .Ar snapshot Ns ...
.Xc .Xc
Lists all existing user references for the given snapshot or snapshots. 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 .It Fl r
Lists the holds that are set on the named descendent snapshots, in addition to Lists the holds that are set on the named descendent snapshots, in addition to
listing the holds on the named snapshot. listing the holds on the named snapshot.
.It Fl H
Do not print headers, use tab-delimited output.
.El .El
.It Xo .It Xo
.Nm .Nm