From a5bae6645e10126b9c862cab87e8f10de95a5647 Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Wed, 20 Apr 2022 11:07:20 +0200
Subject: [PATCH] dump-server-state: upstream release 22.04.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15d5e347..8582054f 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.03.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
+* dump-server-state: upstream release 22.04.1
 * 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 3b66f230..b2560e20 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"
+VERSION="22.04.1"
 readonly VERSION
 
 dump_dir=
@@ -673,7 +673,7 @@ task_df() {
     df_bin=$(command -v df)
 
     if [ -n "${df_bin}" ]; then
-        last_result=$(${df_bin} --portability > "${dump_dir}/df.txt")
+        last_result=$(${df_bin} --portability > "${dump_dir}/df.txt 2>&1")
         last_rc=$?
 
         if [ ${last_rc} -eq 0 ]; then