From 79223572487f8447da8c8486ef717e6a88decc1d Mon Sep 17 00:00:00 2001 From: Andrea Mazzotti Date: Thu, 29 Feb 2024 11:31:16 +0100 Subject: [PATCH 1/2] Always exit 0 if version is equal Signed-off-by: Andrea Mazzotti --- framework/files/usr/sbin/suc-upgrade | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/framework/files/usr/sbin/suc-upgrade b/framework/files/usr/sbin/suc-upgrade index 32eab2ccb..8ffa66640 100755 --- a/framework/files/usr/sbin/suc-upgrade +++ b/framework/files/usr/sbin/suc-upgrade @@ -72,15 +72,16 @@ function isActiveSystem() { esac fi - if [ "$FORCE" != "true" ]; then - if isEqualVersion; then - echo "Upgrade already done with release:" - cat ${HOST_DIR}${RELEASE_FILE} - config - exit 0 - fi + if isEqualVersion; then + echo "Upgrade already done with release:" + cat ${HOST_DIR}${RELEASE_FILE} + config + exit 0 + fi + + if [ "$FORCE" != "true" ]; then if ! isHigherVersion; then echo "Current OS is in a higher version, use FORCE to downgrade. Current version:" cat ${HOST_DIR}${RELEASE_FILE} From cca2b8446f398a78a085dc07e656e86f7b8f6831 Mon Sep 17 00:00:00 2001 From: Andrea Mazzotti Date: Thu, 29 Feb 2024 11:51:22 +0100 Subject: [PATCH 2/2] Remove extra blank line Signed-off-by: Andrea Mazzotti --- framework/files/usr/sbin/suc-upgrade | 1 - 1 file changed, 1 deletion(-) diff --git a/framework/files/usr/sbin/suc-upgrade b/framework/files/usr/sbin/suc-upgrade index 8ffa66640..d51f9113d 100755 --- a/framework/files/usr/sbin/suc-upgrade +++ b/framework/files/usr/sbin/suc-upgrade @@ -72,7 +72,6 @@ function isActiveSystem() { esac fi - if isEqualVersion; then echo "Upgrade already done with release:" cat ${HOST_DIR}${RELEASE_FILE}