mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-22 02:27:36 +03:00
zpool/zfs: allow --json wherever -j is allowed
Mostly so that with the JSON formatting options are also used, they all look the same. To my eye, `-j --json-flat-vdevs` suggests that they are different or unrelated, while `--json --json-flat-vdevs` invites no further questions. Sponsored-by: Klara, Inc. Sponsored-by: Wasabi Technology, Inc. Reviewed-by: Umer Saleem <usaleem@ixsystems.com> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: Tony Hutter <hutter2@llnl.gov> Signed-off-by: Rob Norris <rob.norris@klarasystems.com> Closes #16632
This commit is contained in:
+1
-1
@@ -71,7 +71,7 @@ The following fields are displayed:
|
||||
Used for scripting mode.
|
||||
Do not print headers and separate fields by a single tab instead of arbitrary
|
||||
white space.
|
||||
.It Fl j Op Ar --json-int
|
||||
.It Fl j , -json Op Ar --json-int
|
||||
Print the output in JSON format.
|
||||
Specify
|
||||
.Sy --json-int
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
.Xc
|
||||
Displays all ZFS file systems currently mounted.
|
||||
.Bl -tag -width "-j"
|
||||
.It Fl j
|
||||
.It Fl j , -json
|
||||
Displays all mounted file systems in JSON format.
|
||||
.El
|
||||
.It Xo
|
||||
|
||||
@@ -50,7 +50,7 @@ and any attempts to access or modify other pools will cause an error.
|
||||
.
|
||||
.Sh OPTIONS
|
||||
.Bl -tag -width "-t"
|
||||
.It Fl j
|
||||
.It Fl j , -json
|
||||
Display channel program output in JSON format.
|
||||
When this flag is specified and standard output is empty -
|
||||
channel program encountered an error.
|
||||
|
||||
+1
-1
@@ -130,7 +130,7 @@ The value
|
||||
can be used to display all properties that apply to the given dataset's type
|
||||
.Pq Sy filesystem , volume , snapshot , No or Sy bookmark .
|
||||
.Bl -tag -width "-s source"
|
||||
.It Fl j Op Ar --json-int
|
||||
.It Fl j , -json Op Ar --json-int
|
||||
Display the output in JSON format.
|
||||
Specify
|
||||
.Sy --json-int
|
||||
|
||||
@@ -98,7 +98,7 @@ See the
|
||||
.Xr zpoolprops 7
|
||||
manual page for more information on the available pool properties.
|
||||
.Bl -tag -compact -offset Ds -width "-o field"
|
||||
.It Fl j Op Ar --json-int, --json-pool-key-guid
|
||||
.It Fl j , -json Op Ar --json-int, --json-pool-key-guid
|
||||
Display the list of properties in JSON format.
|
||||
Specify
|
||||
.Sy --json-int
|
||||
@@ -157,7 +157,7 @@ See the
|
||||
.Xr vdevprops 7
|
||||
manual page for more information on the available pool properties.
|
||||
.Bl -tag -compact -offset Ds -width "-o field"
|
||||
.It Fl j Op Ar --json-int
|
||||
.It Fl j , -json Op Ar --json-int
|
||||
Display the list of properties in JSON format.
|
||||
Specify
|
||||
.Sy --json-int
|
||||
|
||||
@@ -59,7 +59,7 @@ is specified, the command exits after
|
||||
.Ar count
|
||||
reports are printed.
|
||||
.Bl -tag -width Ds
|
||||
.It Fl j Op Ar --json-int, --json-pool-key-guid
|
||||
.It Fl j , -json Op Ar --json-int, --json-pool-key-guid
|
||||
Display the list of pools in JSON format.
|
||||
Specify
|
||||
.Sy --json-int
|
||||
|
||||
@@ -70,7 +70,7 @@ See the
|
||||
option of
|
||||
.Nm zpool Cm iostat
|
||||
for complete details.
|
||||
.It Fl j Op Ar --json-int, --json-flat-vdevs, --json-pool-key-guid
|
||||
.It Fl j , -json Op Ar --json-int, --json-flat-vdevs, --json-pool-key-guid
|
||||
Display the status for ZFS pools in JSON format.
|
||||
Specify
|
||||
.Sy --json-int
|
||||
|
||||
Reference in New Issue
Block a user