summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Rajnoha <prajnoha@redhat.com>2014-12-12 10:20:15 +0100
committerPeter Rajnoha <prajnoha@redhat.com>2015-02-10 16:09:40 +0100
commitb93f586954f05147822128b3bf25f668656d2769 (patch)
treec04e1b979feaee44e388f9d35b64abf408350849
parent00744b053f395be79ab1cb80fdf7342548aa79e2 (diff)
downloadlvm2-b93f586954f05147822128b3bf25f668656d2769.tar.gz
tools: allow -S|--select for vgdisplay, lvdisplay and pvdisplay without -C
We already allowed -S|--select with {vg,lv,pv}display -C (which was then equal to {vg,lv,pv}s command. Since we support selection in toolib now, we can support -S also without using -C in *display commands now.
-rw-r--r--WHATS_NEW1
-rw-r--r--tools/commands.h3
-rw-r--r--tools/lvdisplay.c1
-rw-r--r--tools/pvdisplay.c1
-rw-r--r--tools/vgdisplay.c1
5 files changed, 4 insertions, 3 deletions
diff --git a/WHATS_NEW b/WHATS_NEW
index 7fa7d3c5e..b9566f872 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
Version 2.02.117 -
====================================
+ Add support for -S/--select to vgdisplay, lvdisplay and pvdisplay without -C.
Add support for -S/--select to vgremove and lvremove.
Add support for -S/--select to vgchange,lvchange and pvchange.
Add infrastructure to support selection for non-reporting tools.
diff --git a/tools/commands.h b/tools/commands.h
index 63dbb2a11..f8984d1d8 100644
--- a/tools/commands.h
+++ b/tools/commands.h
@@ -369,6 +369,7 @@ xx(lvdisplay,
"\t[--nosuffix]\n"
"\t[-P|--partial]\n"
"\t[--readonly]\n"
+ "\t[-S|--select Selection]\n"
"\t[--units hHbBsSkKmMgGtTpPeE]\n"
"\t[-v|--verbose]\n"
"\t[--version]\n"
@@ -747,6 +748,7 @@ xx(pvdisplay,
"\t[-m|--maps]\n"
"\t[--nosuffix]\n"
"\t[--readonly]\n"
+ "\t[-S|--select Selection]\n"
"\t[-s|--short]\n"
"\t[--units hHbBsSkKmMgGtTpPeE]\n"
"\t[-v|--verbose]\n"
@@ -1049,6 +1051,7 @@ xx(vgdisplay,
"\t[--nosuffix]\n"
"\t[-P|--partial]\n"
"\t[--readonly]\n"
+ "\t[-S|--select Selection]\n"
"\t[--units hHbBsSkKmMgGtTpPeE]\n"
"\t[--version]\n"
"\t[VolumeGroupName [VolumeGroupName...]]\n"
diff --git a/tools/lvdisplay.c b/tools/lvdisplay.c
index 6b1540f54..7d900cc70 100644
--- a/tools/lvdisplay.c
+++ b/tools/lvdisplay.c
@@ -46,7 +46,6 @@ int lvdisplay(struct cmd_context *cmd, int argc, char **argv)
arg_count(cmd, binary_ARG) ||
arg_count(cmd, noheadings_ARG) ||
arg_count(cmd, options_ARG) ||
- arg_count(cmd, select_ARG) ||
arg_count(cmd, separator_ARG) ||
arg_count(cmd, sort_ARG) ||
arg_count(cmd, unbuffered_ARG)) {
diff --git a/tools/pvdisplay.c b/tools/pvdisplay.c
index 94a3bbf65..2763889a9 100644
--- a/tools/pvdisplay.c
+++ b/tools/pvdisplay.c
@@ -77,7 +77,6 @@ int pvdisplay(struct cmd_context *cmd, int argc, char **argv)
arg_count(cmd, binary_ARG) ||
arg_count(cmd, noheadings_ARG) ||
arg_count(cmd, options_ARG) ||
- arg_count(cmd, select_ARG) ||
arg_count(cmd, separator_ARG) ||
arg_count(cmd, sort_ARG) ||
arg_count(cmd, unbuffered_ARG)) {
diff --git a/tools/vgdisplay.c b/tools/vgdisplay.c
index 3c34727e6..5e5ceda6b 100644
--- a/tools/vgdisplay.c
+++ b/tools/vgdisplay.c
@@ -66,7 +66,6 @@ int vgdisplay(struct cmd_context *cmd, int argc, char **argv)
arg_count(cmd, binary_ARG) ||
arg_count(cmd, noheadings_ARG) ||
arg_count(cmd, options_ARG) ||
- arg_count(cmd, select_ARG) ||
arg_count(cmd, separator_ARG) ||
arg_count(cmd, sort_ARG) || arg_count(cmd, unbuffered_ARG)) {
log_error("Incompatible options selected");