From 4558108c4d1ed68b7f47287239b529b0cf909109 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 6 May 2016 11:22:05 +0200 Subject: [PATCH] clamav: rework initskript display download wait, increase time to 15min and remove tmp files at freshclam terminate. Signed-off-by: Arne Fitzenreiter --- lfs/clamav | 2 +- src/initscripts/init.d/clamav | 25 ++++++++++++++++++++----- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/lfs/clamav b/lfs/clamav index a286017730..8911619191 100644 --- 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 5b31e02890..fa080a67b4 100644 --- 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 ;; -- 2.39.5