From 427b1e4524f3ec0267c5a54d58db48a523b60c9d Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 15 May 2024 10:28:02 -0400 Subject: [PATCH] revert soup_scripts back to common --- salt/{manager => common}/soup_scripts.sls | 0 salt/manager/tools/sbin/soup | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename salt/{manager => common}/soup_scripts.sls (100%) diff --git a/salt/manager/soup_scripts.sls b/salt/common/soup_scripts.sls similarity index 100% rename from salt/manager/soup_scripts.sls rename to salt/common/soup_scripts.sls diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index 24b6e5427..0ac938188 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -907,7 +907,7 @@ verify_latest_update_script() { else echo "You are not running the latest soup version. Updating soup and its components. This might take multiple runs to complete." - salt-call state.apply manager.soup_scripts queue=True -lerror --file-root=$UPDATE_DIR/salt --local --out-file=/dev/null + salt-call state.apply common.soup_scripts queue=True -lerror --file-root=$UPDATE_DIR/salt --local --out-file=/dev/null # Verify that soup scripts updated as expected get_soup_script_hashes @@ -915,7 +915,7 @@ verify_latest_update_script() { echo "Succesfully updated soup scripts." else echo "There was a problem updating soup scripts. Trying to rerun script update." - salt-call state.apply manager.soup_scripts queue=True -linfo --file-root=$UPDATE_DIR/salt --local + salt-call state.apply common.soup_scripts queue=True -linfo --file-root=$UPDATE_DIR/salt --local fi echo ""