- bug note: bb#1553

[packages/clamav.git] / clamav.init

diff --git a/clamav.init b/clamav.init
index 370de2db38ffc8247698b7a4f8d4d2073759f734..bcdc1ccb0afd613294d4ca8d33e57a27e0fdcba7 100644 (file)
--- a/clamav.init
+++ b/clamav.init
@@ -4,12 +4,12 @@
 #
 # chkconfig:   345 60 40
 #
-# description: clamd is a antivirus daemon.
+# description: Clam Antivirus daemon
 #
 # processname: clamd
-# pidfile:      /var/run/clamav/clamd.pid
+# pidfile:     /var/run/clamav/clamd.pid
 #
-
+# $Id$
 
 # Source function library
 . /etc/rc.d/init.d/functions
@@ -19,33 +19,35 @@
 
 start() {
        # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/clamd ]; then
-               msg_starting clamd
-               daemon /usr/sbin/clamd
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/clamd
-       else
-               msg_already_running clamd
+       if [ -f /var/lock/subsys/clamd ]; then
+               msg_already_running "Clam Antivirus daemon"
+               return
        fi
+
+       msg_starting "Clam Antivirus daemon"
+       daemon --pidfile /var/run/clamav/clamd.pid /usr/sbin/clamd
+       RETVAL=$?
+       [ $RETVAL -eq 0 ] && touch /var/lock/subsys/clamd
 }
 
 stop() {
-       if [ -f /var/lock/subsys/clamd ]; then
-               msg_stopping clamd
-               killproc --pidfile clamav/clamd.pid clamd
-               rm -f /var/run/clamav/clamd.pid /var/lock/subsys/clamd >/dev/null 2>&1
-       else
-               msg_not_running clamd
+       if [ ! -f /var/lock/subsys/clamd ]; then
+               msg_not_running "Clam Antivirus daemon"
+               return
        fi
+
+       msg_stopping "Clam Antivirus daemon"
+       killproc --pidfile /var/run/clamav/clamd.pid clamd
+       rm -f /var/lock/subsys/clamd /var/run/clamav/clamd.pid >/dev/null 2>&1
 }
 
 reload() {
        if [ -f /var/lock/subsys/clamd ]; then
-               msg_reloading clamd
+               msg_reloading "Clam Antivirus daemon"
                killproc clamd -HUP
                RETVAL=$?
        else
-               msg_not_running clamd
+               msg_not_running "Clam Antivirus daemon"
                RETVAL=7
        fi
 }
@@ -55,7 +57,7 @@ condrestart() {
                stop
                start
        else
-               msg_not_running clamd
+               msg_not_running "Clam Antivirus daemon"
                RETVAL=$1
        fi
 }
@@ -64,10 +66,10 @@ RETVAL=0
 # See how we were called.
 case "$1" in
   start)
-       start
+       start
        ;;
   stop)
-       stop
+       stop
        ;;
   restart)
        stop
@@ -77,7 +79,7 @@ case "$1" in
        condrestart 0
        ;;
   reload|force-reload)
-       reload
+       reload
        ;;
   status)
        status clamd