From 1d450b98296ab949507d2653413dea73ee52e7e0 Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 21 Nov 2020 18:07:01 +0100 Subject: [PATCH] bundles/apt: fix statusfile output of unattended upgrades --- bundles/apt/files/upgrade-and-reboot | 6 ++++-- nodes/htz/ex42-1048908.py | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bundles/apt/files/upgrade-and-reboot b/bundles/apt/files/upgrade-and-reboot index 82aede0..a9f3b76 100644 --- a/bundles/apt/files/upgrade-and-reboot +++ b/bundles/apt/files/upgrade-and-reboot @@ -41,10 +41,12 @@ trap 'rm -f "$softlockdir"/UNATTENDED' EXIT DEBIAN_FRONTEND=noninteractive apt-get -y -q -o Dpkg::Options::=--force-confold -o Dpkg::Options::=--force-confdef dist-upgrade ) ret=$? + +echo "apt-get dist-upgrade exited $ret" +echo "$ret" > "$statusfile" + if (( $ret != 0 )) then - echo "apt-get dist-upgrade exited $ret" - echo "$ret" > "$statusfile" exit 1 fi diff --git a/nodes/htz/ex42-1048908.py b/nodes/htz/ex42-1048908.py index 48ff3fe..d2ec693 100644 --- a/nodes/htz/ex42-1048908.py +++ b/nodes/htz/ex42-1048908.py @@ -324,7 +324,7 @@ nodes['htz.ex42-1048908'] = { 'password': vault.decrypt('encrypt$gAAAAABfp7qzym32R6Go1A6oax0NGQM7EBMckbEbnZC6-RSKx-klSJsL57XbSUTD-AJM-gBIPzlmor-3bfVxPWLRYXtO8uTVw6jNQ1yt15ReHkOTijVqV2ACk-LTDBG3p4YKBn0pQgNvvjXhWV_J1-Pgjywbl4sHXc0zqjCGZ6xtEn6ywj0Pd599JJjREF4QCIFVZVWuKvo1'), }, 'travelynx': { - 'version': '1.18.9', + 'version': '1.18.10', 'mail_from': 'travelynx@franzi.business', }, 'users': {