pre_remove_hook: Really pass full path of the snapshot.

[dss.git] / dss.c

diff --git a/dss.c b/dss.c
index 0a2f55b9fb02035405c791e2343398eeacb78d44..53707bd1cbd6fd0da5197096dc484466ba63805f 100644 (file)
--- a/dss.c
+++ b/dss.c
@@ -161,7 +161,6 @@ static int64_t compute_next_snapshot_time(void)
        struct snapshot *s = NULL;
        struct snapshot_list sl;
 
-       current_snapshot_creation_time = 0;
        dss_get_snapshot_list(&sl);
        FOR_EACH_SNAPSHOT(s, i, &sl) {
                if (!(s->flags & SS_COMPLETE))
@@ -251,8 +250,7 @@ static int pre_remove_hook(struct snapshot *s, const char *why)
        cmd = make_message("%s %s/%s", conf.pre_remove_hook_arg,
                conf.dest_dir_arg, s->name);
        DSS_DEBUG_LOG("executing %s\n", cmd);
-       ret = dss_exec_cmdline_pid(&remove_pid,
-               conf.pre_remove_hook_arg, fds);
+       ret = dss_exec_cmdline_pid(&remove_pid, cmd, fds);
        free(cmd);
        if (ret < 0)
                return ret;
@@ -1119,8 +1117,10 @@ static int select_loop(void)
                case HS_POST_RUNNING:
                        continue;
                case HS_PRE_SUCCESS:
-                       free_rsync_argv(rsync_argv);
-                       create_rsync_argv(&rsync_argv, &current_snapshot_creation_time);
+                       if (!name_of_reference_snapshot) {
+                               free_rsync_argv(rsync_argv);
+                               create_rsync_argv(&rsync_argv, &current_snapshot_creation_time);
+                       }
                        /* fall through */
                case HS_NEEDS_RESTART:
                        if (!next_snapshot_is_due())