From 0e5922c8d8c7ab4170f70ea8d13c896f3ac5167d Mon Sep 17 00:00:00 2001 From: Jeremy Dubois Date: Thu, 9 Jun 2022 17:12:32 +0200 Subject: [PATCH] base: import last dump-server-state.sh upstream version --- roles/base/files/dump-server-state.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/base/files/dump-server-state.sh b/roles/base/files/dump-server-state.sh index 841c5ef..d2d6b14 100644 --- a/roles/base/files/dump-server-state.sh +++ b/roles/base/files/dump-server-state.sh @@ -69,7 +69,8 @@ END } debug() { if [ "${VERBOSE}" = "1" ]; then - echo "$1" + msg="${1:-$(cat /dev/stdin)}" + echo "${msg}" fi } @@ -292,7 +293,7 @@ task_disks() { for disk in ${disks}; do disklabel_bin=$(command -v disklabel) if [ -n "${disklabel_bin}" ]; then - last_result=$(${disklabel_bin} "${disk}" > "${dump_dir}/partitions-${disk}") + last_result=$(${disklabel_bin} "${disk}" 2>/dev/null > "${dump_dir}/partitions-${disk}") last_rc=$? if [ ${last_rc} -eq 0 ]; then