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

[fix] kill -> stop, add indent to service check, revert incorrect logic

Browse Source
This commit is contained in:
William Wernert
2020-12-03 10:31:45 -05:00
parent 786665d8cf
commit f410c451cd
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
setup/so-functions
View File

@@ -1400,11 +1400,11 @@ reinstall_init() {
# Kill any salt processes (safely) # Kill any salt processes (safely)
for service in "${salt_services[@]}"; do for service in "${salt_services[@]}"; do
# Stop the service in the background so we can exit after a certain amount of time # Stop the service in the background so we can exit after a certain amount of time
systemctl kill "$service" & systemctl stop "$service" &
local pid=$! local pid=$!
local count=0 local count=0
while ! (check_service_status "$service"); do while check_service_status "$service"; do
if [[ $count -gt $service_retry_count ]]; then if [[ $count -gt $service_retry_count ]]; then
echo "Could not stop $service after 1 minute, exiting setup." echo "Could not stop $service after 1 minute, exiting setup."