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

[fix] Correct signal naming

Browse Source
This commit is contained in:
William Wernert
2020-12-02 14:06:50 -05:00
parent cc5d54764a
commit fc7fe23590
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
setup/so-functions
View File

@@ -1410,7 +1410,7 @@ reinstall_init() {
# Stop the systemctl process trying to kill the service, show user a message, then exit setup # Stop the systemctl process trying to kill the service, show user a message, then exit setup
kill -9 $pid kill -9 $pid
kill -SIGSOKILL "$(ps --pid $$ -oppid=)"; exit 1 kill -SIGUSR1 "$(ps --pid $$ -oppid=)"; exit 1
fi fi
sleep 5 sleep 5
((count++)) ((count++))
@@ -1650,7 +1650,7 @@ salt_checkin() {
echo "$service still not running" >> "$setup_log" 2>&1 echo "$service still not running" >> "$setup_log" 2>&1
if [ $count -gt 120 ]; then if [ $count -gt 120 ]; then
echo "$service could not be restarted in 120 seconds, exiting" >> "$setup_log" 2>&1 echo "$service could not be restarted in 120 seconds, exiting" >> "$setup_log" 2>&1
kill -SIGSOKILL "$(ps --pid $$ -oppid=)"; exit 1 kill -SIGUSR1 "$(ps --pid $$ -oppid=)"; exit 1
fi fi
sleep 1; sleep 1;
((count++)) ((count++))
@@ -1662,7 +1662,7 @@ salt_checkin() {
echo "salt minion cannot talk to salt master" >> "$setup_log" 2>&1 echo "salt minion cannot talk to salt master" >> "$setup_log" 2>&1
if [ $count -gt 30 ]; then if [ $count -gt 30 ]; then
echo "salt minion could not talk to salt master after 30 attempts, exiting" >> "$setup_log" 2>&1 echo "salt minion could not talk to salt master after 30 attempts, exiting" >> "$setup_log" 2>&1
kill -SIGSOKILL "$(ps --pid $$ -oppid=)"; exit 1 kill -SIGUSR1 "$(ps --pid $$ -oppid=)"; exit 1
fi fi
sleep 1; sleep 1;
((count++)) ((count++))
@@ -1673,7 +1673,7 @@ salt_checkin() {
echo "salt master did not get a job response from salt minion" >> "$setup_log" 2>&1 echo "salt master did not get a job response from salt minion" >> "$setup_log" 2>&1
if [ $count -gt 30 ]; then if [ $count -gt 30 ]; then
echo "salt master did not get a job response from salt minion after 30 attempts, exiting" >> "$setup_log" 2>&1 echo "salt master did not get a job response from salt minion after 30 attempts, exiting" >> "$setup_log" 2>&1
kill -SIGSOKILL "$(ps --pid $$ -oppid=)"; exit 1 kill -SIGUSR1 "$(ps --pid $$ -oppid=)"; exit 1
fi fi
sleep 1; sleep 1;
((count++)) ((count++))

2
setup/so-setup
View File

@@ -485,7 +485,7 @@ fi
# Exit parent script if # Exit parent script if
trap 'catch $? $LINENO' SIGSOKILL trap 'catch $? $LINENO' SIGUSR1
catch() { catch() {
if [ "$1" != 0 ]; then if [ "$1" != 0 ]; then