From 6534f392a9334a2dd1f1b89b9961d116d5c44de7 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 7 Feb 2024 14:25:28 -0500 Subject: [PATCH] update backup filename --- salt/manager/tools/sbin/soup | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index b4647bdbc..5bade9891 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -600,8 +600,11 @@ up_to_2.4.50() { \cp -v "$UPDATE_DIR/salt/manager/tools/sbin/so-yaml.py" "$DEFAULT_SALT_DIR/salt/manager/tools/sbin/" \cp -v "$UPDATE_DIR/salt/manager/tools/sbin/so-yaml.py" /usr/sbin/ echo "Creating a backup of the salt-master config." - cp -v /etc/salt/master "/etc/salt/master.so-$INSTALLEDVERSION" - echo "Adding /opt/so/rules to file_roots using so-yaml" + # INSTALLEDVERSION is 2.4.40 at this point, but we want the backup to have the version + # so was at prior to starting upgrade. use POSTVERSION here since it doesnt change until + # post upgrade changes. POSTVERSION set to INSTALLEDVERSION at start of soup + cp -v /etc/salt/master "/etc/salt/master.so-$POSTVERSION.bak" + echo "Adding /opt/so/rules to file_roots in /etc/salt/master using so-yaml" so-yaml.py append /etc/salt/master file_roots.base /opt/so/rules INSTALLEDVERSION=2.4.50