diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2014-03-31 10:04:24 +0200 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2014-03-31 12:00:45 +0200 |
| commit | caa429da2e58ad65ecfc8836f5f64c54395a8793 (patch) | |
| tree | c8a66da738d4d91a8579bdac6e8e081d6cd94ad6 | |
| parent | 8f9150c241f80b2fd69d2e416340707759e79ac8 (diff) | |
| download | lvm2-caa429da2e58ad65ecfc8836f5f64c54395a8793.tar.gz | |
lvdiplay: prohibit use of -c and -m
It's unclear why we should prohibit use of -v output.
So reenable (like with other 'display' tools)
But -c -m is really unsupported - return invalid cmd.
| -rw-r--r-- | WHATS_NEW | 1 | ||||
| -rw-r--r-- | tools/lvdisplay.c | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -1,5 +1,6 @@ Version 2.02.106 - ==================================== + Add explict error message when using lvdisplay -c -m. Update man pages for pv/vg/lvdisplay. Report error when running pvscan with free argument (i.e. PV name). Fix error message for pvdisplay -c -m and add new for pvdisplay -c -s. diff --git a/tools/lvdisplay.c b/tools/lvdisplay.c index f5531cbbd..246e43b55 100644 --- a/tools/lvdisplay.c +++ b/tools/lvdisplay.c @@ -49,8 +49,8 @@ int lvdisplay(struct cmd_context *cmd, int argc, char **argv) return EINVALID_CMD_LINE; } - if (arg_count(cmd, colon_ARG) && arg_count(cmd, verbose_ARG)) { - log_error("Options -v and -c are incompatible"); + if (arg_count(cmd, colon_ARG) && arg_count(cmd, maps_ARG)) { + log_error("Options -c and -m are incompatible."); return EINVALID_CMD_LINE; } |