zpool/zfs: allow --json
wherever -j
is allowed
#16632
Merged
+72
−33
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[Sponsors: Klara, Inc., Wasabi Technology, Inc.]
Motivation and Context
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.Description
Anywhere
-j
is accepted, also allow--json
. For a couple of things, this means changing togetopt_long()
, but its no big deal.I have left the usage doc using
-j
, and added--json
to the flag descriptions in the manpages only. This is roughly in keeping with existing practice (zpool initialize
). Trying to express both just clutters it up, and I'm not some longopt absolutist!How Has This Been Tested?
By hand. For all commands change, made sure
-j
and--json
appear to do the same thing. Special double-check forzfs mount
andzfs unmount
, which is slightly twisted. Everything looks good to me!Update:
json_sanity
updated by request, now checking both forms.Types of changes
Checklist:
Signed-off-by
.