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

[fix] Also kill currently running jobs

Browse Source
This commit is contained in:
William Wernert
2020-12-01 21:43:38 -05:00
parent 4b5b936abb
commit 2d4fe58299
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
setup/so-functions
View File

@@ -1390,9 +1390,12 @@ reinstall_init() {
local service_retry_count=20 local service_retry_count=20
{ {
# Disable all scheduled jobs
if command -v salt-call &> /dev/null; then if command -v salt-call &> /dev/null; then
salt-call schedule.disable # Disable scheduled jobs so highstate doesn't start running during the install
salt-call -l info schedule.disable
# Kill any currently running salt jobs, also to prevent issues with highstate.
salt-call -l info saltutil.kill_all_jobs
fi fi
# Kill any salt processes (safely) # Kill any salt processes (safely)