This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, master has been updated via 57fda8c8adc66acf92c24d33ccf37636e0e165bc (commit) from b3bc092dad71cf4034d6f0d59708cfa47e8a3404 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 57fda8c8adc66acf92c24d33ccf37636e0e165bc Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Mar 9 06:41:32 2020 +0000
suricata: use KILL is suricata not shut down normal.
sometimes suricata hung and lock the pidfile at suricata stop.
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/142/filelists/files | 1 + src/initscripts/system/suricata | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-)
Difference in files: diff --git a/config/rootfiles/core/142/filelists/files b/config/rootfiles/core/142/filelists/files index 11daea4b5..de55da9c8 100644 --- a/config/rootfiles/core/142/filelists/files +++ b/config/rootfiles/core/142/filelists/files @@ -5,6 +5,7 @@ var/ipfire/langs etc/unbound/unbound.conf etc/rc.d/helper/aws-setup etc/rc.d/helper/azure-setup +etc/rc.d/init.d/suricata etc/rc.d/init.d/unbound etc/suricata/suricata.yaml lib/udev/network-hotplug-bridges diff --git a/src/initscripts/system/suricata b/src/initscripts/system/suricata index 29e58a7e2..f0d4b88d1 100644 --- a/src/initscripts/system/suricata +++ b/src/initscripts/system/suricata @@ -190,7 +190,10 @@ case "$1" in # Flush firewall chain. flush_fw_chain
- # Remove suricata control socket. + # Sometimes suricata not correct shutdown. So killall. + killall -KILL /usr/bin/suricata 2>/dev/null + + # Remove suricata control socket. rm /var/run/suricata/* >/dev/null 2>/dev/null
# Trash remain pid file if still exists.
hooks/post-receive -- IPFire 2.x development tree