CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-13 20:52:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11415 from Security-Onion-Solutions/issue/11390

Browse Source 
Issue/11390
This commit is contained in:
Josh Patterson
2023-09-27 19:39:36 -04:00
committed by GitHub
parent 836c49b755 419acab48a
commit 7d0e1c92a3
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
salt/manager/tools/sbin/soup
View File

@@ -796,7 +796,10 @@ main() {
if [ "$is_hotfix" == "true" ]; then if [ "$is_hotfix" == "true" ]; then
echo "Applying $HOTFIXVERSION hotfix" 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 copy_new_files
apply_hotfix apply_hotfix
echo "Hotfix applied" echo "Hotfix applied"
@@ -853,9 +856,12 @@ main() {
update_centos_repo update_centos_repo
fi fi
echo "" # since we don't run the backup.config_backup state on import we wont snapshot previous version states and pillars
echo "Creating snapshots of default and local Salt states and pillars and saving to /nsm/backup/" if [[ ! "$MINIONID" =~ "_import" ]]; then
backup_old_states_pillars echo ""
echo "Creating snapshots of default and local Salt states and pillars and saving to /nsm/backup/"
backup_old_states_pillars
fi
echo "" echo ""
echo "Copying new Security Onion code from $UPDATE_DIR to $DEFAULT_SALT_DIR." echo "Copying new Security Onion code from $UPDATE_DIR to $DEFAULT_SALT_DIR."