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 remote-tracking branch 'remotes/origin/dev' into issue/6469

Browse Source
This commit is contained in:
m0duspwnens
2021-12-07 10:57:12 -05:00
parent ba30c59ec7 892899b7f9
commit 7549e34881
8 changed files with 50 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
setup/so-functions
View File

@@ -2016,10 +2016,10 @@ reinstall_init() {
{
if command -v salt-call &> /dev/null && grep -q "master:" /etc/salt/minion 2> /dev/null; then
# Disable schedule so highstate doesn't start running during the install
salt-call -l info schedule.disable
salt-call -l info schedule.disable --local
# Kill any currently running salt jobs, also to prevent issues with highstate.
salt-call -l info saltutil.kill_all_jobs
salt-call -l info saltutil.kill_all_jobs --local
fi
# Kill any salt processes (safely)