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

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

Browse Source 
Update soup for 2.3.300
This commit is contained in:
Doug Burks
2024-03-19 16:48:25 -04:00
committed by GitHub
parent 834d18b77c 595f965183
commit 68eb2d3ceb
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

@@ -582,6 +582,7 @@ preupgrade_changes() {
[[ "$INSTALLEDVERSION" == 2.3.260 ]] && up_to_2.3.270 [[ "$INSTALLEDVERSION" == 2.3.260 ]] && up_to_2.3.270
[[ "$INSTALLEDVERSION" == 2.3.270 ]] && up_to_2.3.280 [[ "$INSTALLEDVERSION" == 2.3.270 ]] && up_to_2.3.280
[[ "$INSTALLEDVERSION" == 2.3.280 ]] && up_to_2.3.290 [[ "$INSTALLEDVERSION" == 2.3.280 ]] && up_to_2.3.290
[[ "$INSTALLEDVERSION" == 2.3.290 ]] && up_to_2.3.300
true true
} }
@@ -616,6 +617,7 @@ postupgrade_changes() {
[[ "$POSTVERSION" == 2.3.260 ]] && post_to_2.3.270 [[ "$POSTVERSION" == 2.3.260 ]] && post_to_2.3.270
[[ "$POSTVERSION" == 2.3.270 ]] && post_to_2.3.280 [[ "$POSTVERSION" == 2.3.270 ]] && post_to_2.3.280
[[ "$POSTVERSION" == 2.3.280 ]] && post_to_2.3.290 [[ "$POSTVERSION" == 2.3.280 ]] && post_to_2.3.290
[[ "$POSTVERSION" == 2.3.290 ]] && post_to_2.3.300
true true
} }
@@ -791,6 +793,11 @@ post_to_2.3.290() {
POSTVERSION=2.3.290 POSTVERSION=2.3.290
} }
post_to_2.3.300() {
echo "Nothing to do for .300"
POSTVERSION=2.3.300
}
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
@@ -1166,6 +1173,11 @@ up_to_2.3.290() {
INSTALLEDVERSION=2.3.290 INSTALLEDVERSION=2.3.290
} }
up_to_2.3.300() {
echo "Upgrading to 2.3.300"
INSTALLEDVERSION=2.3.300
}
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