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

block redirected to setup_log already, prevent double logging on these lines

Browse Source
This commit is contained in:
Josh Patterson
2026-01-07 16:58:44 -05:00
parent 4ab20c2454
commit 693494024d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
setup/so-functions
View File

@@ -1634,7 +1634,7 @@ reinstall_init() {
{
# remove all of root's cronjobs
logCmd "crontab -r -u root"
crontab -r -u root
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
@@ -1644,7 +1644,7 @@ reinstall_init() {
salt-call -l info saltutil.kill_all_jobs --local
fi
logCmd "salt-call state.apply ca.remove -linfo --local --file-root=../salt"
salt-call state.apply ca.remove -linfo --local --file-root=../salt
# Kill any salt processes (safely)
for service in "${salt_services[@]}"; do
@@ -1657,7 +1657,7 @@ reinstall_init() {
local count=0
while check_service_status "$service"; do
if [[ $count -gt $service_retry_count ]]; then
info "Could not stop $service after 1 minute, exiting setup."
echo "Could not stop $service after 1 minute, exiting setup."
# Stop the systemctl process trying to kill the service, show user a message, then exit setup
kill -9 $pid
@@ -1695,10 +1695,10 @@ reinstall_init() {
backup_dir /nsm/influxdb "$date_string"
# Uninstall local Elastic Agent, if installed
logCmd "elastic-agent uninstall -f"
elastic-agent uninstall -f
if [[ $is_deb ]]; then
info "Unholding previously held packages."
echo "Unholding previously held packages."
apt-mark unhold $(apt-mark showhold)
fi