Remove backup_enable() calls after create_toolcontext() calls.

Identical argument to previous patch which removed archive_enable() calls.
We add a new parameter to backup_init() which sets the enable value based
on the cmd->default_settings.backup value.  This value was used to set
cmd->current_settings.backup, used in the removed backup_enable() call.

diff --git a/daemons/clvmd/lvm-functions.c b/daemons/clvmd/lvm-functions.c
index ef4953b3b0cbfba8b060275b4a7acc65cf1ed4a6..3673803ad5392a95d09b17f4ce06a9654225423d 100644 (file)
--- a/daemons/clvmd/lvm-functions.c
+++ b/daemons/clvmd/lvm-functions.c
@@ -733,7 +733,6 @@ int init_lvm(int using_gulm)
        init_syslog(LOG_DAEMON);
        openlog("clvmd", LOG_PID, LOG_DAEMON);
        set_activation(cmd->current_settings.activation);
-       backup_enable(cmd, cmd->current_settings.backup);
        cmd->cmd_line = (char *)"clvmd";
 
        /* Check lvm.conf is setup for cluster-LVM */

diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c
index 0fd096357b0be2ebcb08a6294a81b7cde8e1aa91..186a81601ab06059114e5952ebeea531554d13d2 100644 (file)
--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
@@ -925,7 +925,7 @@ static int _init_backup(struct cmd_context *cmd)
 
        if (!cmd->sys_dir) {
                log_warn("WARNING: Metadata changes will NOT be backed up");
-               backup_init(cmd, "");
+               backup_init(cmd, "", 0);
                archive_init(cmd, "", 0, 0, 0);
                return 1;
        }
@@ -973,7 +973,7 @@ static int _init_backup(struct cmd_context *cmd)
 
        dir = find_config_tree_str(cmd, "backup/backup_dir", default_dir);
 
-       if (!backup_init(cmd, dir)) {
+       if (!backup_init(cmd, dir, cmd->default_settings.backup)) {
                log_debug("backup_init failed.");
                return 0;
        }

diff --git a/lib/format_text/archiver.c b/lib/format_text/archiver.c
index e0f3af327e0fb517ff96e1b67c819b9927d618df..9234e2e870244dbe9b406c47b173ae406fff7988 100644 (file)
--- a/lib/format_text/archiver.c
+++ b/lib/format_text/archiver.c
@@ -150,7 +150,8 @@ int archive_display_file(struct cmd_context *cmd, const char *file)
        return r;
 }
 
-int backup_init(struct cmd_context *cmd, const char *dir)
+int backup_init(struct cmd_context *cmd, const char *dir,
+               int enabled)
 {
        if (!(cmd->backup_params = dm_pool_zalloc(cmd->libmem,
                                               sizeof(*cmd->archive_params)))) {
@@ -166,6 +167,7 @@ int backup_init(struct cmd_context *cmd, const char *dir)
                log_error("Couldn't copy backup directory name.");
                return 0;
        }
+       backup_enable(cmd, enabled);
 
        return 1;
 }

diff --git a/lib/format_text/archiver.h b/lib/format_text/archiver.h
index 835d677d229d2ddaf0f0768b3cb99a403dc19cb1..eb58ae9de89e888a9f6a65058ba60b7e038d2faa 100644 (file)
--- a/lib/format_text/archiver.h
+++ b/lib/format_text/archiver.h
@@ -41,7 +41,7 @@ int archive(struct volume_group *vg);
 int archive_display(struct cmd_context *cmd, const char *vg_name);
 int archive_display_file(struct cmd_context *cmd, const char *file);
 
-int backup_init(struct cmd_context *cmd, const char *dir);
+int backup_init(struct cmd_context *cmd, const char *dir, int enabled);
 void backup_exit(struct cmd_context *cmd);
 
 void backup_enable(struct cmd_context *cmd, int flag);

diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 0bd875ee773e80b97aeec85fb5e828bfaf83abfb..2c6c60d54f4a1299efa2f41e6cbfca0725fa1d7c 100644 (file)
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -1097,8 +1097,6 @@ struct cmd_context *init_lvm(unsigned is_static)
        init_msg_prefix(cmd->default_settings.msg_prefix);
        init_cmd_name(cmd->default_settings.cmd_name);
 
-       backup_enable(cmd, cmd->current_settings.backup);
-
        set_activation(cmd->current_settings.activation);
 
        cmd->fmt = arg_ptr_value(cmd, metadatatype_ARG,