From bfa65be8c7fb9ee0ff8fba27bf50cdafd7daa32e Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 29 Nov 2008 18:44:40 +0100
Subject: [PATCH] clamav initskript boot's clamav in background now

---
 doc/packages-list.txt         |  1 -
 src/initscripts/init.d/clamav | 32 ++++++++++++++++++++------------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 59d6d4f80..25678aca7 100644
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -196,7 +196,6 @@
 * misc-progs
 * mkinitcpio-0.5.9
 * mktemp-1.5
-* mldonkey-2.9.2
 * mldonkey-2.9.6
 * module-init-tools-3.5
 * mpc-0.12.1
diff --git a/src/initscripts/init.d/clamav b/src/initscripts/init.d/clamav
index 7484938bf..5b31e0289 100644
--- a/src/initscripts/init.d/clamav
+++ b/src/initscripts/init.d/clamav
@@ -6,19 +6,27 @@
 
 case "$1" in
 	start)
-		boot_mesg "Starting Clamav Definition Updater..."
-		loadproc /usr/bin/freshclam -d -c 10
+		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
-			[ -e "/usr/share/clamav/main.cvd" ] && \
-				[ -e "/usr/share/clamav/daily.c*d" ] && \
-					break
-			sleep 5
-			COUNTER=$(($COUNTER + 1))
-		done
-		loadproc /usr/sbin/clamd
+			boot_mesg "Starting Clamav Daemon..."
+			COUNTER=0
+			while [ "$COUNTER" -lt "30" ]; do
+				[ -e "/usr/share/clamav/main.cvd" ] && \
+					[ -e "/usr/share/clamav/daily.cvd" ] || \
+					[ -e "/usr/share/clamav/daily.cld" ] && \
+				break
+				sleep 5
+				COUNTER=$(($COUNTER + 1))
+			done
+			loadproc /usr/sbin/clamd
+		else
+			boot_mesg "Starting Clamav in background..."
+			/etc/init.d/clamav start > /dev/tty12 < /dev/tty12 &
+			echo_ok;
+			exit 0;
+		fi
 		;;
 
 	stop)
-- 
2.39.2