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 #9998 from Security-Onion-Solutions/dougburks-patch-1

Browse Source 
Update soup for 2.3.230
This commit is contained in:
Doug Burks
2023-03-24 12:38:39 -04:00
committed by GitHub
parent 7e4ce7b81d aa2e18fca9
commit ca9a93a4b0
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -554,6 +554,8 @@ preupgrade_changes() {
[[ "$INSTALLEDVERSION" == 2.3.190 ]] && up_to_2.3.200 [[ "$INSTALLEDVERSION" == 2.3.190 ]] && up_to_2.3.200
[[ "$INSTALLEDVERSION" == 2.3.200 ]] && up_to_2.3.210 [[ "$INSTALLEDVERSION" == 2.3.200 ]] && up_to_2.3.210
[[ "$INSTALLEDVERSION" == 2.3.210 ]] && up_to_2.3.220 [[ "$INSTALLEDVERSION" == 2.3.210 ]] && up_to_2.3.220
[[ "$INSTALLEDVERSION" == 2.3.220 ]] && up_to_2.3.230
true true
} }
@@ -580,6 +582,7 @@ postupgrade_changes() {
[[ "$POSTVERSION" == 2.3.190 ]] && post_to_2.3.200 [[ "$POSTVERSION" == 2.3.190 ]] && post_to_2.3.200
[[ "$POSTVERSION" == 2.3.200 ]] && post_to_2.3.210 [[ "$POSTVERSION" == 2.3.200 ]] && post_to_2.3.210
[[ "$POSTVERSION" == 2.3.210 ]] && post_to_2.3.220 [[ "$POSTVERSION" == 2.3.210 ]] && post_to_2.3.220
[[ "$POSTVERSION" == 2.3.220 ]] && post_to_2.3.230
true true
} }
@@ -713,6 +716,11 @@ post_to_2.3.220() {
POSTVERSION=2.3.220 POSTVERSION=2.3.220
} }
post_to_2.3.230() {
echo "Nothing to do for .230"
POSTVERSION=2.3.230
}
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
@@ -1053,6 +1061,11 @@ up_to_2.3.220() {
INSTALLEDVERSION=2.3.220 INSTALLEDVERSION=2.3.220
} }
up_to_2.3.230() {
echo "Upgrading to 2.3.230"
INSTALLEDVERSION=2.3.230
}
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