From 19a0ebb8ea752e9e3c1eab968ecd26942035702f Mon Sep 17 00:00:00 2001
From: Jeremy Dubois <jdubois@evolix.fr>
Date: Wed, 18 May 2022 09:53:21 +0200
Subject: [PATCH] base: import last zzz_evobackup upstream version

---
 roles/base/files/zzz_evobackup | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/roles/base/files/zzz_evobackup b/roles/base/files/zzz_evobackup
index 09234d2..56741ed 100755
--- a/roles/base/files/zzz_evobackup
+++ b/roles/base/files/zzz_evobackup
@@ -328,7 +328,7 @@ if [ "${LOCAL_TASKS}" = "1" ]; then
 
     if [ "${SYSTEM}" = "linux" ]; then
         if [ -n "${dump_server_state_bin}" ]; then
-            ${dump_server_state_bin} --all --force --backup-dir "${server_state_dir}"
+            ${dump_server_state_bin} --all --force --dump-dir "${server_state_dir}"
         else
             mkdir -p "${server_state_dir}"
 
@@ -367,7 +367,7 @@ if [ "${LOCAL_TASKS}" = "1" ]; then
         fi
     else
         if [ -n "${dump_server_state_bin}" ]; then
-            ${dump_server_state_bin} --all --force --backup-dir "${server_state_dir}"
+            ${dump_server_state_bin} --all --force --dump-dir "${server_state_dir}"
         else
             mkdir -p "${server_state_dir}"
 
@@ -436,6 +436,8 @@ if [ "${SYNC_TASKS}" = "1" ]; then
 
     log "START SYNC_TASKS - server=${server}"
 
+    update-evobackup-canary --who "${PROGNAME}"
+
     # /!\ DO NOT USE COMMENTS in the rsync command /!\
     # It breaks the command and destroys data, simply remove (or add) lines.
 
@@ -494,6 +496,7 @@ if [ "${SYNC_TASKS}" = "1" ]; then
             /root                                          \
             /var                                           \
             /home                                          \
+            /zzz_evobackup_canary                          \
         -e "${RSH_COMMAND}"                                \
         "root@${SSH_SERVER}:/var/backup/"                  \
         | tail -30 >> $LOGFILE