Skip to content

Commit

Permalink
Support '-H' (scripted mode) to 'zpool get'
Browse files Browse the repository at this point in the history
This functionality is already available in 'zfs get'.  Providing
it for 'zpool get' is useful and good for consistency.

Signed-off-by: Turbo Fredriksson <turbo@bayour.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes: #2522
  • Loading branch information
FransUrbo authored and behlendorf committed Jul 25, 2014
1 parent a60e668 commit 79eb71d
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
8 changes: 6 additions & 2 deletions cmd/zpool/zpool_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ get_usage(zpool_help_t idx) {
case HELP_EVENTS:
return (gettext("\tevents [-vHfc]\n"));
case HELP_GET:
return (gettext("\tget [-p] <\"all\" | property[,...]> "
return (gettext("\tget [-pH] <\"all\" | property[,...]> "
"<pool> ...\n"));
case HELP_SET:
return (gettext("\tset <property=value> <pool> \n"));
Expand Down Expand Up @@ -5617,12 +5617,16 @@ zpool_do_get(int argc, char **argv)
int c, ret;

/* check options */
while ((c = getopt(argc, argv, "p")) != -1) {
while ((c = getopt(argc, argv, "pH")) != -1) {
switch (c) {
case 'p':
cb.cb_literal = B_TRUE;
break;

case 'H':
cb.cb_scripted = B_TRUE;
break;

case '?':
(void) fprintf(stderr, gettext("invalid option '%c'\n"),
optopt);
Expand Down
13 changes: 12 additions & 1 deletion man/man8/zpool.8
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ zpool \- configures ZFS storage pools

.LP
.nf
\fBzpool get\fR [\fB-p\fR] "\fIall\fR" | \fIproperty\fR[,...] \fIpool\fR ...
\fBzpool get\fR [\fB-pH\fR] "\fIall\fR" | \fIproperty\fR[,...] \fIpool\fR ...
.fi

.LP
Expand Down Expand Up @@ -1079,6 +1079,17 @@ See the "Properties" section for more information on the available pool properti
Display numbers in parseable (exact) values.
.RE

.sp
.ne 2
.mk
.na
\fB\fB-H\fR\fR
.ad
.RS 6n
.rt
Scripted mode. Do not display headers, and separate fields by a single tab instead of arbitrary space.
.RE

.RE

.sp
Expand Down

0 comments on commit 79eb71d

Please sign in to comment.