SOURCES: cyrus-sync.init - switch to start-stop-daemon because syn...

[glen]

Author: glen                         Date: Fri Feb 22 12:44:27 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- switch to start-stop-daemon because sync_client is lame to write pid by it's own, by Eero Hanninen

---- Files affected:
SOURCES:
   cyrus-sync.init (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/cyrus-sync.init
diff -u SOURCES/cyrus-sync.init:1.1 SOURCES/cyrus-sync.init:1.2
--- SOURCES/cyrus-sync.init:1.1	Thu Feb 21 12:29:08 2008
+++ SOURCES/cyrus-sync.init	Fri Feb 22 13:44:22 2008
@@ -25,9 +25,9 @@
 
 start() {
 	# Check if the service is already running?
-	if [ ! -f /var/lock/subsys/<service> ]; then
+	if [ ! -f /var/lock/subsys/cyrus-sync ]; then
 		msg_starting cyrus-sync
-		daemon /usr/lib/cyrus/sync_client -r &
+		start-stop-daemon --start --quiet --exec /usr/lib/cyrus/sync_client -- -r
 		if ps -C sync_client >/dev/null 2>&1; then
 			RETVAL=$?
 			[ $RETVAL -eq 0 ] && touch /var/lock/subsys/cyrus-sync
@@ -44,9 +44,14 @@
 	if [ -f /var/lock/subsys/cyrus-sync ]; then
 		# Stop daemons.
 		msg_stopping cyrus-sync
-		killproc sync_client
-		killproc sync_client -TERM
-		rm -f /var/lock/subsys/cyrus-sync
+		start-stop-daemon --stop --quiet --name "sync_client"
+		RETVAL=$?
+		if [ $RETVAL -eq 0 ]; then
+			rm -f /var/lock/subsys/cyrus-sync
+			ok
+		else
+			fail
+		fi
 	else
 		msg_not_running cyrus-sync
 	fi
@@ -56,17 +61,17 @@
 # See how we were called.
 case "$1" in
   start)
-  	start
+	start
 	;;
   stop)
-  	stop
+	stop
 	;;
   restart|force-reload)
 	stop
 	start
 	;;
   status)
-	status <service>
+	status cyrus-sync
 	RETVAL=$?
 	;;
   *)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/cyrus-sync.init?r1=1.1&r2=1.2&f=u