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

Browse Source 
Update soup for 2.3.270
This commit is contained in:
Doug Burks
2023-09-11 09:08:21 -04:00
committed by GitHub
parent 1a9f8f0bc2 29f12fac90
commit 7763218b71
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

@@ -579,6 +579,7 @@ preupgrade_changes() {
[[ "$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
[[ "$INSTALLEDVERSION" == 2.3.260 ]] && up_to_2.3.270
true
}
@@ -610,6 +611,7 @@ postupgrade_changes() {
[[ "$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
[[ "$POSTVERSION" == 2.3.260 ]] && post_to_2.3.270
true
}
@@ -763,6 +765,11 @@ post_to_2.3.260() {
POSTVERSION=2.3.260
}
post_to_2.3.270() {
echo "Nothing to do for .270"
POSTVERSION=2.3.270
}
stop_salt_master() {
# kill all salt jobs across the grid because the hang indefinitely if they are queued and salt-master restarts
set +e
@@ -1123,6 +1130,11 @@ up_to_2.3.260() {
INSTALLEDVERSION=2.3.260
}
up_to_2.3.270() {
echo "Upgrading to 2.3.270"
INSTALLEDVERSION=2.3.270
}
verify_upgradespace() {
CURRENTSPACE=$(df -BG / | grep -v Avail | awk '{print $4}' | sed 's/.$//')
if [ "$CURRENTSPACE" -lt "10" ]; then