From d5e62fb33381e6048a80b59e3b0bd54c93128ff7 Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Apr 13 2024 12:44:25 +0000 Subject: Avoid exit on needs-rebooting query The script is correctly configured to fail on errors, but the needs-rebooting call needs to be exempted in order for its > 0 returns to be processed. Signed-off-by: Georg Pfuetzenreuter --- diff --git a/salt/profile/monitoring/prometheus/files/textfile/scripts/zypper-metrics.sh.jinja b/salt/profile/monitoring/prometheus/files/textfile/scripts/zypper-metrics.sh.jinja index 7a71f9e..38e39cd 100755 --- a/salt/profile/monitoring/prometheus/files/textfile/scripts/zypper-metrics.sh.jinja +++ b/salt/profile/monitoring/prometheus/files/textfile/scripts/zypper-metrics.sh.jinja @@ -24,12 +24,14 @@ zypper_count_pending_updates () { } zypper_needs_rebooting () { + set +e zypper needs-rebooting 1>/dev/null case "$?" in 0 ) echo 0 ;; 102 ) echo 1 ;; * ) exit 1 ;; esac + set -e } {