From 9db9af27aed759eaceeaf0132608c8fc4e2d0c97 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Wed, 3 Apr 2024 15:14:50 -0400 Subject: [PATCH] Attempt to fix 2.3 when main repo changes --- salt/manager/tools/sbin/soup | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index a585f877c..9e972b4bc 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -837,7 +837,16 @@ main() { echo "### Preparing soup at $(date) ###" echo "" - + if [[ "$INSTALLEDVERISON" =~ ^2.3.* ]]; then + BRANCH="2.3/main" + cd $UPDATE_DIR + clone_to_tmp + cp $UPDATE_DIR/salt/common/tools/sbin/soup /usr/sbin + cp $UPDATE_DIR/salt/common/tools/sbin/soup /opt/so/saltstack/default/salt/common/tools/sbin + add_common + echo "Please run soup again" + exit 0 + fi set_os check_salt_master_status 1 || fail "Could not talk to salt master: Please run 'systemctl status salt-master' to ensure the salt-master service is running and check the log at /opt/so/log/salt/master."