From: Antoni Date: Fri, 17 May 2024 10:54:08 +0000 (+0200) Subject: Exit with new code when trying to finish before RO update completes X-Git-Tag: accepted/tizen/unified/20240606.161520~3^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e252374ac1cbd8a1b9da8936a504acaccf606970;p=platform%2Fcore%2Fsystem%2Fupgrade.git Exit with new code when trying to finish before RO update completes Change-Id: Id1ef08ccb72b6b3b9a1eed7b4bde6df3fe53c268 --- diff --git a/scripts/upgrade-support/upgrade-trigger.sh b/scripts/upgrade-support/upgrade-trigger.sh index 27ba833..4f4f019 100644 --- a/scripts/upgrade-support/upgrade-trigger.sh +++ b/scripts/upgrade-support/upgrade-trigger.sh @@ -11,6 +11,9 @@ fi PROGRESS_AFTER_RO=80 PROGRESS_AFTER_CLONING=20 +ERR_RO_UPDATE_IN_PROGRESS=2 +ERR_FINISH_BEFORE_RO_UPDATE_COMPLETE=3 + PATH=/bin:/usr/bin:/sbin:/usr/sbin FOTA_DIR="/opt/usr/data/fota" STATUS_DIR="/opt/data/update" @@ -119,7 +122,7 @@ do_finish() { current_upgrade_status=$(device_board_get_upgrade_status) if [ "$current_upgrade_status" != "$PROGRESS_AFTER_RO" ]; then critical_log "[Error] Cannot finish upgrade - RO Upgrade has not been completed" - exit_error + exit $ERR_FINISH_BEFORE_RO_UPDATE_COMPLETE fi run_script "${FOTA_DIR}/${SCRIPT_UPGRADE_FOTA}" @@ -191,7 +194,7 @@ fi if [ $MODE_RO_UPDATE = false ] && [ $MODE_FINISH_UPDATE = true ]; then if ! flock -n 9; then echo "[Error] Upgrade in progress" - exit 2 + exit $ERR_RO_UPDATE_IN_PROGRESS fi else flock 9