From: Roi Dayan <roid@mellanox.com>
To: Stephen Hemminger <stephen@networkplumber.org>
Cc: netdev@vger.kernel.org, Jiri Pirko <jiri@mellanox.com>,
Paul Blakey <paulb@mellanox.com>, Roi Dayan <roid@mellanox.com>
Subject: [PATCH iproute2 net-next] devlink: Add json and pretty options to help and man
Date: Mon, 6 Mar 2017 11:06:18 +0200 [thread overview]
Message-ID: <1488791178-17220-1-git-send-email-roid@mellanox.com> (raw)
While at it also fixed missing double dash for long opts.
Signed-off-by: Roi Dayan <roid@mellanox.com>
---
devlink/devlink.c | 2 +-
man/man8/devlink.8 | 14 ++++++++++++--
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/devlink/devlink.c b/devlink/devlink.c
index c357580..e90226e 100644
--- a/devlink/devlink.c
+++ b/devlink/devlink.c
@@ -2470,7 +2470,7 @@ static void help(void)
{
pr_err("Usage: devlink [ OPTIONS ] OBJECT { COMMAND | help }\n"
"where OBJECT := { dev | port | sb | monitor }\n"
- " OPTIONS := { -V[ersion] | -n[no-nice-names] }\n");
+ " OPTIONS := { -V[ersion] | -n[no-nice-names] | -j[json] | -p[pretty] }\n");
}
static int dl_cmd(struct dl *dl)
diff --git a/man/man8/devlink.8 b/man/man8/devlink.8
index cf0563b..a480766 100644
--- a/man/man8/devlink.8
+++ b/man/man8/devlink.8
@@ -20,19 +20,29 @@ devlink \- Devlink tool
.IR OPTIONS " := { "
\fB\-V\fR[\fIersion\fR] |
\fB\-n\fR[\fIno-nice-names\fR] }
+\fB\-j\fR[\fIjson\fR] }
+\fB\-p\fR[\fIpretty\fR] }
.SH OPTIONS
.TP
-.BR "\-V" , " -Version"
+.BR "\-V" , " --Version"
Print the version of the
.B devlink
utility and exit.
.TP
-.BR "\-n" , " -no-nice-names"
+.BR "\-n" , " --no-nice-names"
Turn off printing out nice names, for example netdevice ifnames instead of devlink port identification.
+.TP
+.BR "\-j" , " --json"
+Generate JSON output.
+
+.TP
+.BR "\-p" , " --pretty"
+When combined with -j generate a pretty JSON output.
+
.SS
.I OBJECT
--
2.7.4
next reply other threads:[~2017-03-06 9:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-06 9:06 Roi Dayan [this message]
2017-03-06 10:41 ` [PATCH iproute2 net-next] devlink: Add json and pretty options to help and man Jiri Pirko
2017-03-09 1:59 ` Stephen Hemminger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1488791178-17220-1-git-send-email-roid@mellanox.com \
--to=roid@mellanox.com \
--cc=jiri@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=paulb@mellanox.com \
--cc=stephen@networkplumber.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).