From 55356857b2228e3f7c334c574146533e2eb4c10e Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Tue, 26 Apr 2022 09:56:47 +0200
Subject: [PATCH] dump-server-state: upstream release 22.04.2

---
 CHANGELOG.md                             | 2 +-
 evolinux-base/files/dump-server-state.sh | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0626cd38..6dd72cf3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,7 +23,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 * evocheck: upstream release 22.04.1
 * evolinux-base: Add non-free repos & install non-free firmware on dedicated hardware
 * evolinux-base: rename backup-server-state to dump-server-state
-* dump-server-state: upstream release 22.04.1
+* dump-server-state: upstream release 22.04.2
 * generate-ldif: Add services check for bkctld
 * minifirewall: restore "force-restart" and fix "restart-if-needed"
 * minifirewall: tail template follows symlinks
diff --git a/evolinux-base/files/dump-server-state.sh b/evolinux-base/files/dump-server-state.sh
index 1b80bd0a..5bb3cd4e 100644
--- a/evolinux-base/files/dump-server-state.sh
+++ b/evolinux-base/files/dump-server-state.sh
@@ -3,7 +3,7 @@
 PROGNAME="dump-server-state"
 REPOSITORY="https://gitea.evolix.org/evolix/dump-server-state"
 
-VERSION="22.04.1"
+VERSION="22.04.2"
 readonly VERSION
 
 dump_dir=
@@ -725,7 +725,8 @@ task_mysql_processes() {
             else
                 debug "* mysqladmin ERROR"
                 debug "${last_result}"
-                rc=10
+                # Ignore errors because we don't know how to deal with multiple instances
+                # rc=10
             fi
         else
             debug "* no mysqld or mariadbd process is running"