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

Browse Source 
Update soup for 2.3.180
This commit is contained in:
Doug Burks
2022-10-11 17:14:55 +00:00
committed by GitHub
parent 5199ea483e 7401008523
commit a930f8233d
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -547,6 +547,7 @@ preupgrade_changes() {
[[ "$INSTALLEDVERSION" == 2.3.140 ]] && up_to_2.3.150 [[ "$INSTALLEDVERSION" == 2.3.140 ]] && up_to_2.3.150
[[ "$INSTALLEDVERSION" == 2.3.150 ]] && up_to_2.3.160 [[ "$INSTALLEDVERSION" == 2.3.150 ]] && up_to_2.3.160
[[ "$INSTALLEDVERSION" == 2.3.160 ]] && up_to_2.3.170 [[ "$INSTALLEDVERSION" == 2.3.160 ]] && up_to_2.3.170
[[ "$INSTALLEDVERSION" == 2.3.170 ]] && up_to_2.3.180
true true
} }
@@ -566,7 +567,7 @@ postupgrade_changes() {
[[ "$POSTVERSION" == 2.3.140 ]] && post_to_2.3.150 [[ "$POSTVERSION" == 2.3.140 ]] && post_to_2.3.150
[[ "$POSTVERSION" == 2.3.150 ]] && post_to_2.3.160 [[ "$POSTVERSION" == 2.3.150 ]] && post_to_2.3.160
[[ "$POSTVERSION" == 2.3.160 ]] && post_to_2.3.170 [[ "$POSTVERSION" == 2.3.160 ]] && post_to_2.3.170
[[ "$POSTVERSION" == 2.3.170 ]] && post_to_2.3.180
true true
} }
@@ -662,6 +663,10 @@ post_to_2.3.170() {
echo "Nothing to do for .170" echo "Nothing to do for .170"
} }
post_to_2.3.180() {
echo "Nothing to do for .180"
}
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
@@ -951,6 +956,11 @@ up_to_2.3.170() {
INSTALLEDVERSION=2.3.170 INSTALLEDVERSION=2.3.170
} }
up_to_2.3.180() {
echo "Upgrading to 2.3.180"
INSTALLEDVERSION=2.3.180
}
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