[oe-commits] Roman I Khimov : clamav: wait on stop in init
git version control
git at git.openembedded.org
Tue Mar 30 17:55:19 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 654351c29d60f2d68a648054f8324ce48b8be44d
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=654351c29d60f2d68a648054f8324ce48b8be44d
Author: Roman I Khimov <khimov at altell.ru>
Date: Fri Sep 4 17:37:03 2009 +0400
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 at altell.ru>
---
recipes/clamav/clamav.inc | 2 +-
recipes/clamav/files/clamav-daemon.init | 6 ++++++
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/recipes/clamav/clamav.inc b/recipes/clamav/clamav.inc
index 405e3c7..b6aa2a2 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 6fd0714..b506cca 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)
More information about the Openembedded-commits
mailing list