[Debian-ha-svn-commits] [SCM] corosync Debian packaging branch, squeeze, updated. debian/1.2.1-3

[Guido Günther]

The following commit has been merged in the squeeze branch:
commit 0d7cc00fb0e0538ef3ae4a038b7d0ea4f6f0e705
Author: Guido Günther <agx at sigxcpu.org>
Date:   Tue Dec 7 12:45:51 2010 +0100

    Don't timeout during daemon shut down
    
    since this might leave pacemaker resources running.
    See: http://developerbugs.linux-foundation.org/show_bug.cgi?id=2217
    
    Closes: #556533

diff --git a/debian/corosync.init b/debian/corosync.init
index b00404b..c59c26f 100644
--- a/debian/corosync.init
+++ b/debian/corosync.init
@@ -64,7 +64,7 @@ do_stop()
 	#   1 if daemon was already stopped
 	#   2 if daemon could not be stopped
 	#   other if a failure occurred
-	start-stop-daemon --stop --quiet --signal=QUIT --retry=5 --pidfile $PIDFILE
+	start-stop-daemon --stop --quiet --retry forever/QUIT/1 --pidfile $PIDFILE
 	RETVAL="$?"
 	[ "$RETVAL" = 2 ] && return 2
 	# Many daemons don't delete their pidfiles when they exit.

-- 
corosync Debian packaging