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

fix logging when using wait_for_minion

Browse Source
This commit is contained in:
m0duspwnens
2023-10-19 16:53:03 -04:00
parent dfcbbfd157
commit dbfccdfff8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -829,7 +829,7 @@ main() {
echo "Hotfix applied" echo "Hotfix applied"
update_version update_version
enable_highstate enable_highstate
wait_for_salt_minion "$MINIONID" "5" "$SOUP_LOG" || fail "Salt minion was not running or ready." wait_for_salt_minion "$MINIONID" "5" '/dev/stdout' 2>&1 | tee -a "$SOUP_LOG" || fail "Salt minion was not running or ready."
highstate highstate
else else
echo "" echo ""
@@ -928,7 +928,7 @@ main() {
echo "" echo ""
echo "Running a highstate. This could take several minutes." echo "Running a highstate. This could take several minutes."
set +e set +e
wait_for_salt_minion "$MINIONID" "5" "$SOUP_LOG" || fail "Salt minion was not running or ready." wait_for_salt_minion "$MINIONID" "5" '/dev/stdout' 2>&1 | tee -a "$SOUP_LOG" || fail "Salt minion was not running or ready."
highstate highstate
set -e set -e
@@ -944,7 +944,7 @@ main() {
set -e set -e
echo "Running a highstate to complete the Security Onion upgrade on this manager. This could take several minutes." echo "Running a highstate to complete the Security Onion upgrade on this manager. This could take several minutes."
wait_for_salt_minion "$MINIONID" "5" "$SOUP_LOG" || fail "Salt minion was not running or ready." wait_for_salt_minion "$MINIONID" "5" '/dev/stdout' 2>&1 | tee -a "$SOUP_LOG" || fail "Salt minion was not running or ready."
highstate highstate
postupgrade_changes postupgrade_changes
[[ $is_airgap -eq 0 ]] && unmount_update [[ $is_airgap -eq 0 ]] && unmount_update