tools: allow -S|--select for vgexport and vgimport

diff --git a/WHATS_NEW b/WHATS_NEW
index b9566f8727cc6d22dda87f2fd4e5a3c6dcb15471..314cfd8b517904ed262abe334fcf985692e59c14 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.117 - 
 ====================================
+  Add support for -S/--select to vgexport and vgimport.
   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.

diff --git a/tools/commands.h b/tools/commands.h
index f8984d1d806276cd35a7c06ee97c02d2c24aa36d..5221f791126291d293c4a7c29b1de7d5956b33bc 100644 (file)
--- a/tools/commands.h
+++ b/tools/commands.h
@@ -1091,11 +1091,12 @@ xx(vgexport,
    "\t[--commandprofile ProfileName]\n"
    "\t[-d|--debug]\n"
    "\t[-h|--help]\n"
+   "\t[-S|--select Selection]\n"
    "\t[-v|--verbose]\n"
    "\t[--version]\n"
    "\tVolumeGroupName [VolumeGroupName...]\n",
 
-   all_ARG, test_ARG)
+   all_ARG, select_ARG, test_ARG)
 
 xx(vgextend,
    "Add physical volumes to a volume group",
@@ -1129,12 +1130,13 @@ xx(vgimport,
    "\t[-d|--debug]\n"
    "\t[-f|--force]\n"
    "\t[-h|--help]\n"
+   "\t[-S|--select Selection]\n"
    "\t[-t|--test]\n"
    "\t[-v|--verbose]\n"
    "\t[--version]\n"
    "\tVolumeGroupName...\n",
 
-   all_ARG, force_ARG, test_ARG)
+   all_ARG, force_ARG, select_ARG, test_ARG)
 
 xx(vgmerge,
    "Merge volume groups",

diff --git a/tools/vgexport.c b/tools/vgexport.c
index aeff612e1fc4bf49698b19836390567293bb84ab..d4be3c760d7c69bc709c5b508c92d491e48d67c4 100644 (file)
--- a/tools/vgexport.c
+++ b/tools/vgexport.c
@@ -51,12 +51,12 @@ bad:
 
 int vgexport(struct cmd_context *cmd, int argc, char **argv)
 {
-       if (!argc && !arg_count(cmd, all_ARG)) {
-               log_error("Please supply volume groups or use -a for all.");
+       if (!argc && !arg_count(cmd, all_ARG) && !arg_is_set(cmd, select_ARG)) {
+               log_error("Please supply volume groups or use -S for selection or use -a for all.");
                return EINVALID_CMD_LINE;
        }
 
-       if (argc && arg_count(cmd, all_ARG)) {
+       if (arg_count(cmd, all_ARG) && (argc || arg_is_set(cmd, select_ARG))) {
                log_error("No arguments permitted when using -a for all.");
                return EINVALID_CMD_LINE;
        }

diff --git a/tools/vgimport.c b/tools/vgimport.c
index 857f4a9fcfeafc65c50d1d40ddaf9cd09fe71119..d5ca7c33bd7885bdcab606ff5bfc662f403079b3 100644 (file)
--- a/tools/vgimport.c
+++ b/tools/vgimport.c
@@ -58,12 +58,12 @@ bad:
 
 int vgimport(struct cmd_context *cmd, int argc, char **argv)
 {
-       if (!argc && !arg_count(cmd, all_ARG)) {
-               log_error("Please supply volume groups or use -a for all.");
+       if (!argc && !arg_count(cmd, all_ARG) && !arg_is_set(cmd, select_ARG)) {
+               log_error("Please supply volume groups or -S for selection or use -a for all.");
                return EINVALID_CMD_LINE;
        }
 
-       if (argc && arg_count(cmd, all_ARG)) {
+       if (arg_count(cmd, all_ARG) && (argc || arg_is_set(cmd, select_ARG))) {
                log_error("No arguments permitted when using -a for all.");
                return EINVALID_CMD_LINE;
        }