[SVN] r284 - in branches/sarge/cyrus-imapd-2.2.12/debian: TODO.Debian cyrus-common-2.2.cyrus2.2.init

[debian at incase.de]

Author: sven
Date: Sat Jan 28 22:02:36 2006
New Revision: 284

URL: https://mail.incase.de/viewcvs?root=cyrus22?view=rev&rev=284
Log:
Merge changes from r278, r279, r282 and r283 in /trunk tobranches/sarge
Modified:
    branches/sarge/cyrus-imapd-2.2.12/debian/TODO.Debian
    branches/sarge/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cyrus2.2.init

Modified: branches/sarge/cyrus-imapd-2.2.12/debian/TODO.Debian
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/sarge/cyrus-imapd-2.2.12/debian/TODO.Debian?view=diff&rev=284&p1=branches/sarge/cyrus-imapd-2.2.12/debian/TODO.Debian&r1=283&p2=branches/sarge/cyrus-imapd-2.2.12/debian/TODO.Debian&r2=284
==============================================================================
--- branches/sarge/cyrus-imapd-2.2.12/debian/TODO.Debian (original)
+++ branches/sarge/cyrus-imapd-2.2.12/debian/TODO.Debian Sat Jan 28 22:02:36 2006
@@ -4,7 +4,6 @@
 $Id$
 
 EXTRA HIGH
-o --name for start-stop-daemon
 o master leaks memory when a service path is not null
 
 HIGH

Modified: branches/sarge/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cyrus2.2.init
URL: https://mail.incase.de/viewcvs?root=cyrus22/branches/sarge/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cyrus2.2.init?view=diff&rev=284&p1=branches/sarge/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cyrus2.2.init&r1=283&p2=branches/sarge/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cyrus2.2.init&r2=284
==============================================================================
--- branches/sarge/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cyrus2.2.init (original)
+++ branches/sarge/cyrus-imapd-2.2.12/debian/cyrus-common-2.2.cyrus2.2.init Sat Jan 28 22:02:36 2006
@@ -44,7 +44,7 @@
 
 set -e
 
-START="--start --quiet --pidfile /var/run/${NAME}.pid --exec ${DAEMON} -- ${OPTIONS}"
+START="--start --quiet --pidfile /var/run/${NAME}.pid --exec ${DAEMON} --name ${NAME} -- ${OPTIONS}"
 
 verifydb() {
    while read -r DBKEY DBVALUE ; do
@@ -93,7 +93,7 @@
 			return 0
 		fi
 	fi	
-	if [ -s /var/run/${NAME}.pid ] && kill -0 `cat /var/run/${NAME}.pid`; then
+	if [ -s /var/run/${NAME}.pid ] && kill -0 `cat /var/run/${NAME}.pid` > /dev/null 2>&1; then
 		return 0
 	else
 		# the PID file might simply not match the cyrmaster process.
@@ -159,7 +159,7 @@
   stop)
 	echo -n "Stopping $DESC: "
 	if start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
-			--quiet --startas $DAEMON >/dev/null 2>&1 ; then
+		-- name ${NAME} --quiet --startas $DAEMON >/dev/null 2>&1 ; then
 		echo "$NAME."
 		rm -f /var/run/${NAME}.pid
 		exit 0
@@ -181,7 +181,7 @@
   reload|force-reload)
 	echo "Reloading $DESC configuration files."
 	if start-stop-daemon --stop --signal 1 --quiet \
-		--pidfile /var/run/$NAME.pid --exec $DAEMON >/dev/null 2>&1 ; then
+		--name ${NAME} --pidfile /var/run/$NAME.pid --exec $DAEMON >/dev/null 2>&1 ; then
 		exit 0
 	else
 		exit 1