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 27ba8335442fc9bff4e6e7a9584aa7a5dafcc305..4f4f0197c750f04c3d47e667badd966b6a430cdb 100644 (file)
--- 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