Changd the guardian check.

[people/pmueller/ipfire-2.x.git] / src / initscripts / init.d / snort

diff --git a/src/initscripts/init.d/snort b/src/initscripts/init.d/snort
index 6323e2be9054e4d58c161e5d85165bd5c946519a..b157b802cdbff234f8a4cccd29fd2460270aa6cb 100644 (file)
--- a/src/initscripts/init.d/snort
+++ b/src/initscripts/init.d/snort
@@ -118,10 +118,13 @@ case "$1" in
               
               rm /var/run/snort_* >/dev/null 2>/dev/null
                 
-              if [ -r /var/ipfire/guardian/enable ]; then
+              if ([ -r /var/ipfire/guardian/enable ] || [ ! -z $(pidofproc /usr/local/bin/guardian.pl) ]); then
                          boot_mesg "Stopping Guardian..."
                          killproc /usr/local/bin/guardian.pl
                          fi
+
+               # Don't report returncode of rm if snort was not started
+               exit 0
         ;;
                 
         status)