diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index 8c6c2b237..8259bf6ab 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -518,7 +518,7 @@ up_to_2.4.10() { } up_to_2.4.20() { - echo "Nothing to do for 2.4.20" + echo "Preupgrade soup changes for 2.4.20" INSTALLEDVERSION=2.4.20 } @@ -796,7 +796,10 @@ main() { if [ "$is_hotfix" == "true" ]; then echo "Applying $HOTFIXVERSION hotfix" - backup_old_states_pillars + # since we don't run the backup.config_backup state on import we wont snapshot previous version states and pillars + if [[ ! "$MINIONID" =~ "_import" ]]; then + backup_old_states_pillars + fi copy_new_files apply_hotfix echo "Hotfix applied" @@ -853,9 +856,12 @@ main() { update_centos_repo fi - echo "" - echo "Creating snapshots of default and local Salt states and pillars and saving to /nsm/backup/" - backup_old_states_pillars + # since we don't run the backup.config_backup state on import we wont snapshot previous version states and pillars + if [[ ! "$MINIONID" =~ "_import" ]]; then + echo "" + echo "Creating snapshots of default and local Salt states and pillars and saving to /nsm/backup/" + backup_old_states_pillars + fi echo "" echo "Copying new Security Onion code from $UPDATE_DIR to $DEFAULT_SALT_DIR."