diff options
| author | Peter Rajnoha <prajnoha@redhat.com> | 2014-12-12 12:03:34 +0100 |
|---|---|---|
| committer | Peter Rajnoha <prajnoha@redhat.com> | 2015-02-09 14:20:28 +0100 |
| commit | d6c3abda429685e14ad8e1ae7dff5f1353933877 (patch) | |
| tree | 8fbe2669f3d67127164e2f0d73096fc8fc8cfcf9 | |
| parent | 95607f927c49faf8b519ed2262cda1c487ba8453 (diff) | |
| download | lvm2-d6c3abda429685e14ad8e1ae7dff5f1353933877.tar.gz | |
tools: allow -S|--select for vgexport and vgimport
| -rw-r--r-- | tools/commands.h | 6 | ||||
| -rw-r--r-- | tools/vgexport.c | 6 | ||||
| -rw-r--r-- | tools/vgimport.c | 6 |
3 files changed, 10 insertions, 8 deletions
diff --git a/tools/commands.h b/tools/commands.h index f8984d1d8..5221f7911 100644 --- 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 aeff612e1..d4be3c760 100644 --- 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 857f4a9fc..d5ca7c33b 100644 --- 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; } |