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 #10204 from Security-Onion-Solutions/jertel/2.3.240_soup

Browse Source 
soup update for 2.3.240
This commit is contained in:
Jason Ertel
2023-04-25 09:46:28 -04:00
committed by GitHub
parent db1bd16758 71ab8ddf1d
commit f04c01b28c
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

@@ -555,6 +555,7 @@ preupgrade_changes() {
[[ "$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 [[ "$INSTALLEDVERSION" == 2.3.220 ]] && up_to_2.3.230
[[ "$INSTALLEDVERSION" == 2.3.230 ]] && up_to_2.3.240
true true
} }
@@ -583,6 +584,7 @@ postupgrade_changes() {
[[ "$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 [[ "$POSTVERSION" == 2.3.220 ]] && post_to_2.3.230
[[ "$POSTVERSION" == 2.3.230 ]] && post_to_2.3.240
true true
} }
@@ -721,6 +723,11 @@ post_to_2.3.230() {
POSTVERSION=2.3.230 POSTVERSION=2.3.230
} }
post_to_2.3.240() {
echo "Nothing to do for .240"
POSTVERSION=2.3.240
}
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
@@ -1066,6 +1073,11 @@ up_to_2.3.230() {
INSTALLEDVERSION=2.3.230 INSTALLEDVERSION=2.3.230
} }
up_to_2.3.240() {
echo "Upgrading to 2.3.240"
INSTALLEDVERSION=2.3.240
}
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