clamav: rework initskript

display download wait, increase time to 15min and
remove tmp files at freshclam terminate.

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/lfs/clamav b/lfs/clamav
index a28601773095038579b0ff0af4b281b7ea4598b8..89116191919aab0b58deaabefe214bab3ce3e4b1 100644 (file)
--- a/lfs/clamav
+++ b/lfs/clamav
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = clamav
-PAK_VER    = 32
+PAK_VER    = 33
 
 DEPS       = ""
 

diff --git a/src/initscripts/init.d/clamav b/src/initscripts/init.d/clamav
index 5b31e02890b2bd6c5f98532ee8f981d45f4d10d3..fa080a67b4885fbe57228cce947a0217d1409e06 100644 (file)
--- a/src/initscripts/init.d/clamav
+++ b/src/initscripts/init.d/clamav
@@ -9,17 +9,31 @@ case "$1" in
                if [ $(basename $0) == "clamav" ]; then 
                        boot_mesg "Starting Clamav Definition Updater..."
                        loadproc /usr/bin/freshclam -d -c 10
-               
-                       boot_mesg "Starting Clamav Daemon..."
+
                        COUNTER=0
-                       while [ "$COUNTER" -lt "30" ]; do
+                       while [ "$COUNTER" -lt "61" ]; do
                                [ -e "/usr/share/clamav/main.cvd" ] && \
                                        [ -e "/usr/share/clamav/daily.cvd" ] || \
                                        [ -e "/usr/share/clamav/daily.cld" ] && \
                                break
-                               sleep 5
+                               if [ "$COUNTER" -lt "1" ]; then
+                                       boot_mesg -n "Download db "
+                               else
+                                       boot_mesg -n "."
+                               fi
+                               sleep 15
                                COUNTER=$(($COUNTER + 1))
                        done
+                       if [ "$COUNTER" -gt "0" ]; then
+                               boot_mesg
+                       fi
+                       if [ "$COUNTER" -gt "60" ]; then
+                               boot_mesg "Download takes longer than 15min check freshclam status!"
+                               echo_failure;
+                               exit 1;
+                       fi
+
+                       boot_mesg "Starting Clamav Daemon..."
                        loadproc /usr/sbin/clamd
                else
                        boot_mesg "Starting Clamav in background..."
@@ -32,7 +46,8 @@ case "$1" in
        stop)
                boot_mesg "Stopping Clamav Definition Updater..."
                killproc /usr/bin/freshclam
-               
+               rm -rf /usr/share/clamav/*.tmp
+
                boot_mesg "Stopping Clamav Daemon..."
                killproc /usr/sbin/clamd
                ;;