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>

diff --git a/config/rootfiles/core/142/filelists/files b/config/rootfiles/core/142/filelists/files
index 11daea4b5c310d1b44ba03de125de3cb7e5a000f..de55da9c8ed8f7413e17f6b52da2283041263192 100644 (file)
--- 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/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
 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 29e58a7e290b044e7217f8edca8baeebecc34e15..f0d4b88d1fe96de251be8cac957d5e856b8036c0 100644 (file)
--- a/src/initscripts/system/suricata
+++ b/src/initscripts/system/suricata
@@ -190,7 +190,10 @@ case "$1" in
                # Flush firewall chain.
                flush_fw_chain
 
                # 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.
                rm /var/run/suricata/* >/dev/null 2>/dev/null
 
                # Trash remain pid file if still exists.