From: Roman I Khimov <khimov@altell.ru>
Date: Fri, 4 Sep 2009 13:37:03 +0000 (+0400)
Subject: clamav: wait on stop in init
X-Git-Tag: Release-2010-05/1~152^2~124
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=654351c29d60f2d68a648054f8324ce48b8be44d;p=openembedded.git

clamav: wait on stop in init

Takes some time for clamav to shut down and it's better to return from
init script only when it actually is stopped.

Signed-off-by: Roman I Khimov <khimov@altell.ru>
---

diff --git a/recipes/clamav/clamav.inc b/recipes/clamav/clamav.inc
index 405e3c7c28..b6aa2a29e3 100644
--- a/recipes/clamav/clamav.inc
+++ b/recipes/clamav/clamav.inc
@@ -18,7 +18,7 @@ RRECOMMENDS_${PN} = "${PN}-freshclam"
 RRECOMMENDS_${PN}-daemon = "${PN}-freshclam"
 RPROVIDES_${PN}-freshclam = "${PN}-data"
 
-INC_PR = "r2"
+INC_PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/clamav/clamav-${PV}.tar.gz;name=clamav-${PV} \
           file://clamav-daemon.init \
diff --git a/recipes/clamav/files/clamav-daemon.init b/recipes/clamav/files/clamav-daemon.init
index 6fd07146ea..b506ccadb3 100644
--- a/recipes/clamav/files/clamav-daemon.init
+++ b/recipes/clamav/files/clamav-daemon.init
@@ -28,6 +28,12 @@ case "$1" in
   stop)
     echo -n "Stopping $DESC: "
     start-stop-daemon -K -p $PID
+    for i in `seq 1 5`; do
+	if start-stop-daemon -p $PID -t -K >/dev/null 2>&1; then
+	    break;
+	fi
+	sleep 1
+    done
     ;;
 
     restart|force-reload)