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

Merge pull request #8793 from Security-Onion-Solutions/TOoSmOotH-patch-3

Browse Source 
Update soup
This commit is contained in:
Mike Reeves
2022-09-22 09:22:20 -04:00
committed by GitHub
parent 535b9f86db b8355b3a03
commit 956d3e4345
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
salt/common/tools/sbin/soup
View File

@@ -546,6 +546,7 @@ preupgrade_changes() {
[[ "$INSTALLEDVERSION" == 2.3.130 ]] && up_to_2.3.140 [[ "$INSTALLEDVERSION" == 2.3.130 ]] && up_to_2.3.140
[[ "$INSTALLEDVERSION" == 2.3.140 ]] && up_to_2.3.150 [[ "$INSTALLEDVERSION" == 2.3.140 ]] && up_to_2.3.150
[[ "$INSTALLEDVERSION" == 2.3.150 ]] && up_to_2.3.160 [[ "$INSTALLEDVERSION" == 2.3.150 ]] && up_to_2.3.160
[[ "$INSTALLEDVERSION" == 2.3.160 ]] && up_to_2.3.170
true true
} }
@@ -564,6 +565,7 @@ postupgrade_changes() {
[[ "$POSTVERSION" == 2.3.130 ]] && post_to_2.3.140 [[ "$POSTVERSION" == 2.3.130 ]] && post_to_2.3.140
[[ "$POSTVERSION" == 2.3.140 ]] && post_to_2.3.150 [[ "$POSTVERSION" == 2.3.140 ]] && post_to_2.3.150
[[ "$POSTVERSION" == 2.3.150 ]] && post_to_2.3.160 [[ "$POSTVERSION" == 2.3.150 ]] && post_to_2.3.160
[[ "$POSTVERSION" == 2.3.160 ]] && post_to_2.3.170
true true
@@ -656,6 +658,10 @@ post_to_2.3.160() {
echo "Nothing to do for .160" echo "Nothing to do for .160"
} }
post_to_2.3.170() {
echo "Nothing to do for .170"
}
stop_salt_master() { stop_salt_master() {
# kill all salt jobs across the grid because the hang indefinitely if they are queued and salt-master restarts # kill all salt jobs across the grid because the hang indefinitely if they are queued and salt-master restarts
set +e set +e
@@ -940,6 +946,11 @@ up_to_2.3.160() {
INSTALLEDVERSION=2.3.160 INSTALLEDVERSION=2.3.160
} }
up_to_2.3.170() {
echo "Upgrading to 2.3.170"
INSTALLEDVERSION=2.3.170
}
verify_upgradespace() { verify_upgradespace() {
CURRENTSPACE=$(df -BG / | grep -v Avail | awk '{print $4}' | sed 's/.$//') CURRENTSPACE=$(df -BG / | grep -v Avail | awk '{print $4}' | sed 's/.$//')
if [ "$CURRENTSPACE" -lt "10" ]; then if [ "$CURRENTSPACE" -lt "10" ]; then