diff options
| author | LOLi <[email protected]> | 2018-08-19 00:47:41 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-08-18 15:47:41 -0700 |
| commit | a9d6270acb7f529cb446c46b429a52631777452f (patch) | |
| tree | 7953b2b79240ad152d9ae1de7ead8d1edd22fa14 | |
| parent | 1f87313ac830970088389a6d6e68fa3ce8194aff (diff) | |
'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 <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: loli10K <[email protected]>
Closes #7798
| -rw-r--r-- | cmd/zfs/zfs_main.c | 7 | ||||
| -rw-r--r-- | man/man8/zfs.8 | 6 |
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 |