diff options
| -rw-r--r-- | tools/lvmcmdline.c | 12 | ||||
| -rw-r--r-- | tools/toollib.c | 7 | ||||
| -rw-r--r-- | tools/tools.h | 1 |
3 files changed, 19 insertions, 1 deletions
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index a5bb6a5c5..6bbf1af26 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -179,6 +179,18 @@ static const struct command_function _command_functions[CMD_COUNT] = { /* Command line args */ +int arg_is_valid_for_command(const struct cmd_context *cmd, int a) +{ + int i; + + for (i = 0; i < cmd->cname->num_args; i++) { + if (cmd->cname->valid_args[i] == a) + return 1; + } + + return 0; +} + unsigned arg_count(const struct cmd_context *cmd, int a) { return cmd->opt_arg_values ? cmd->opt_arg_values[a].count : 0; diff --git a/tools/toollib.c b/tools/toollib.c index 6b590189b..2f4756b6b 100644 --- a/tools/toollib.c +++ b/tools/toollib.c @@ -2313,7 +2313,12 @@ static int _resolve_duplicate_vgnames(struct cmd_context *cmd, * is unknown. */ log_error("Multiple VGs found with the same name: skipping %s", sl->str); - log_error("Use --select vg_uuid=<uuid> in place of the VG name."); + + if (arg_is_valid_for_command(cmd, select_ARG)) + log_error("Use --select vg_uuid=<uuid> in place of the VG name."); + else + log_error("Use VG uuid in place of the VG name."); + dm_list_del(&sl->list); ret = ECMD_FAILED; } diff --git a/tools/tools.h b/tools/tools.h index 36da3bc7e..60952a2aa 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -193,6 +193,7 @@ int repairtype_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_v int dumptype_arg(struct cmd_context *cmd __attribute__((unused)), struct arg_values *av); /* we use the enums to access the switches */ +int arg_is_valid_for_command(const struct cmd_context *cmd, int a); unsigned arg_count(const struct cmd_context *cmd, int a); unsigned arg_is_set(const struct cmd_context *cmd, int a); int arg_from_list_is_set(const struct cmd_context *cmd, const char *err_found, ...); |