From d2574faaef08a887efc1ca2d61c6276be434037b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Dubois?= <jdubois@evolix.fr>
Date: Mon, 5 Jun 2023 10:46:53 +0200
Subject: [PATCH] base: dump-server-state.sh upstream release 23.06

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

diff --git a/CHANGELOG b/CHANGELOG
index c6c2601..475edd8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -68,10 +68,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * nagios-nrpe: check_ipsecctl.sh is never used standalone for check_vpn, always called by check_ipsecctl_critiques.sh
 * evobackup: zzz_evobackup upstream release 22.12, and call zzz_evobackup with bash
 * base: install bash, now needed for zzz_evobackup script
-* base: dump-server-state.sh upstream release 23.03
 * post-install: execute motd-carp-state.sh only once an hour
 * collectd: modified collectd scripts directory and scripts files right so that only _collectd group can execute them
 * base: install ncdu and htop often used as diagnostic tools
+* base: dump-server-state.sh upstream release 23.06
 
 ### Fixed
 
diff --git a/roles/base/files/dump-server-state.sh b/roles/base/files/dump-server-state.sh
index 61c60b6..047d50a 100644
--- a/roles/base/files/dump-server-state.sh
+++ b/roles/base/files/dump-server-state.sh
@@ -3,7 +3,7 @@
 PROGNAME="dump-server-state"
 REPOSITORY="https://gitea.evolix.org/evolix/dump-server-state"
 
-VERSION="23.03"
+VERSION="23.06"
 readonly VERSION
 
 dump_dir=
@@ -432,7 +432,7 @@ task_rcctl() {
         last_result=$(${rcctl_bin} ls failed > "${dump_dir}/rcctl-failed-services.txt")
         last_rc=$?
 
-        if [ ${last_rc} -eq 0 ]; then
+        if [ ${last_rc} -eq 0 ] || [ ${last_rc} -eq 1 ]; then
             debug "* failed services OK"
         else
             debug "* failed services ERROR"