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

Merge pull request #10610 from Security-Onion-Solutions/dougburks-patch-1

Browse Source 
Update soup for 2.3.260
This commit is contained in:
Doug Burks
2023-06-16 13:10:42 -04:00
committed by GitHub
parent e74c2fa1b0 3d687f0404
commit 15b3982930
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -557,6 +557,7 @@ preupgrade_changes() {
[[ "$INSTALLEDVERSION" == 2.3.220 ]] && up_to_2.3.230
[[ "$INSTALLEDVERSION" == 2.3.230 ]] && up_to_2.3.240
[[ "$INSTALLEDVERSION" == 2.3.240 ]] && up_to_2.3.250
[[ "$INSTALLEDVERSION" == 2.3.250 ]] && up_to_2.3.260
true
}
@@ -587,6 +588,7 @@ postupgrade_changes() {
[[ "$POSTVERSION" == 2.3.220 ]] && post_to_2.3.230
[[ "$POSTVERSION" == 2.3.230 ]] && post_to_2.3.240
[[ "$POSTVERSION" == 2.3.240 ]] && post_to_2.3.250
[[ "$POSTVERSION" == 2.3.250 ]] && post_to_2.3.260
true
}
@@ -735,6 +737,11 @@ post_to_2.3.250() {
POSTVERSION=2.3.250
}
post_to_2.3.260() {
echo "Nothing to do for .260"
POSTVERSION=2.3.260
}
stop_salt_master() {
# kill all salt jobs across the grid because the hang indefinitely if they are queued and salt-master restarts
set +e
@@ -1090,6 +1097,11 @@ up_to_2.3.250() {
INSTALLEDVERSION=2.3.250
}
up_to_2.3.260() {
echo "Upgrading to 2.3.260"
INSTALLEDVERSION=2.3.260
}
verify_upgradespace() {
CURRENTSPACE=$(df -BG / | grep -v Avail | awk '{print $4}' | sed 's/.$//')
if [ "$CURRENTSPACE" -lt "10" ]; then