refact: code structure and error handling + report

Author: simonwalz

system/cuos/do-update-lxc.sh

@@ -26,13 +26,15 @@ IMAGE_VERSION_STRING="${LXC_IMAGE}@${LXC_IMAGE_DIGEST}"
 
 if [[ "${IMAGE_VERSION_STRING}" == "$(cat /etc/image)" ]]; then
   echo "No new image version available. Exiting."
+  report_info "cuos:update:not_needed" "The system is up-to-date"
   exit 22
 fi
 
 AVAIL_BYTES=$(df -B1 "/" | awk 'NR==2 {print $4}')
 REQUIRED_BYTES=$((2 * 1024 * 1024 * 1024))
 if [ "$AVAIL_BYTES" -le "$REQUIRED_BYTES" ]; then
   echo "Not enough free space in ${TARGET_ROOT} (required: >2GB, available: $((AVAIL_BYTES/1024/1024)) MB). Aborting update." >&2
+  report_info "cuos:update:no_space" "Not enough free disk space available"
   exit 21
 fi
 
@@ -49,6 +51,7 @@ fi
 
 if [[ "${IMAGE_VERSION}@${NEW_DIGEST}" == "$(cat /etc/image)" ]]; then
   echo "No new image version available (post). Exiting."
+  report_info "cuos:update:not_needed" "The system is up-to-date"
   exit 22
 fi
 

system/cuos/do-update.sh

@@ -30,7 +30,8 @@ OS_DIGEST="$(jq -r --arg arch "${OS_ARCH}" '.[$arch+"_image_digest"] // .os_imag
 IMAGE_VERSION_STRING="${OS_IMAGE}@${OS_DIGEST}"
 
 if [[ "${IMAGE_VERSION_STRING}" == "$(cat /etc/image)" ]]; then
-  echo "No new image version available. Exiting."
+  echo "No new image version available. Exiting (pre)"
+  report_info "cuos:update:not_needed" "The system is up-to-date"
   exit 22
 fi
 
@@ -81,10 +82,11 @@ if [[ "${DOCKER_EXIT_CODE}" = "0" ]]; then
 
   sync
   reboot
-elif [[ "${DOCKER_EXIT_CODE}" = "20" ]]; then
+elif [[ "${DOCKER_EXIT_CODE}" = "102" ]]; then
   echo "No new image version available."
-  report_info "cuos:update:not_needed" "No new image version available"
-elif [[ "${DOCKER_EXIT_CODE}" = "22" ]]; then
+  report_info "cuos:update:not_needed" "The system is up-to-date"
+
+elif [[ "${DOCKER_EXIT_CODE}" = "101" ]]; then
   echo "Not enough free disk space available"
   report_info "cuos:update:no_space" "Not enough free disk space available"
 else

updater/perform_update.sh

@@ -73,7 +73,7 @@ fi
 IMAGE_VERSION_STRING="${IMAGE}@${NEW_DIGEST}"
 
 if [[ "${IMAGE_VERSION_STRING}" == "$(cat /etc/image 2>/dev/null)" ]]; then
-  raise_info 102 "No OS update failable"
+  raise_info 102 "No OS update available"
 fi
 
 echo "INFO: Updating OS slot ${SLOT} to ${IMAGE}"