shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-18 10:04:20 +03:00
Code Releases Activity

Refactor _override_settings to take the new config string as input.

Browse Source 
We will re-use this function from liblvm.

Signed-off-by: Dave Wysochanski <dwysocha@redhat.com>
This commit is contained in:
Dave Wysochanski 2009-07-27 21:01:36 +00:00
parent ee7e183f7e
commit 776ac1562e
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/lvmcmdline.c
View File

@ -887,9 +887,9 @@ int help(struct cmd_context *cmd __attribute((unused)), int argc, char **argv)
return ret;
}
static int _override_settings(struct cmd_context *cmd)
static int _override_settings(struct cmd_context *cmd, const char *config_settings)
{
if (!(cmd->cft_override = create_config_tree_from_string(cmd, arg_str_value(cmd, config_ARG, "")))) {
if (!(cmd->cft_override = create_config_tree_from_string(cmd, config_settings))) {
log_error("Failed to set overridden configuration entries.");
return EINVALID_CMD_LINE;
}
@ -986,7 +986,8 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv)
set_cmd_name(cmd->command->name);
if (arg_count(cmd, config_ARG))
if ((ret = _override_settings(cmd)))
if ((ret = _override_settings(cmd,
arg_str_value(cmd, config_ARG, ""))))
goto_out;
if (arg_count(cmd, config_ARG) || !cmd->config_valid || config_files_changed(cmd)) {