[Pkg-Cyrus-imapd-Debian-devel] [SVN] r181 - trunk/cyrus-imapd-2.2.12/debian/changelog trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.cyrus22.init

[debian at incase.de]

Author: sven
Date: Sun Nov 13 20:15:03 2005
New Revision: 181

URL: https://mail.incase.de/viewcvs?root=cyrus22?view=rev&rev=181
Log:
Fix init script problem found by Benjamin Seidenberg
Modified:
    trunk/cyrus-imapd-2.2.12/debian/changelog
    trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.cyrus22.init

Modified: trunk/cyrus-imapd-2.2.12/debian/changelog
URL: https://mail.incase.de/viewcvs?root=cyrus22/trunk/cyrus-imapd-2.2.12/debian/changelog?view=diff&rev=181&p1=trunk/cyrus-imapd-2.2.12/debian/changelog&r1=180&p2=trunk/cyrus-imapd-2.2.12/debian/changelog&r2=181
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.12/debian/changelog Sun Nov 13 20:15:03 2005
@@ -1,3 +1,11 @@
+cyrus22-imapd (2.2.12-0.8) unstable; urgency=low
+
+  [ Sven Mueller ]
+  * Fix a problem in the init scripts new status check, found by Benjamin
+    Seidenberg.
+
+ -- Sven Mueller <debian at incase.de>  Sun, 13 Nov 2005 20:14:05 +0100
+
 cyrus22-imapd (2.2.12-0.7) unstable; urgency=low
 
   [ Sven Mueller ]

Modified: trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.cyrus22.init
URL: https://mail.incase.de/viewcvs?root=cyrus22/trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.cyrus22.init?view=diff&rev=181&p1=trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.cyrus22.init&r1=180&p2=trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.cyrus22.init&r2=181
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.cyrus22.init (original)
+++ trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.cyrus22.init Sun Nov 13 20:15:03 2005
@@ -93,7 +93,7 @@
 			return 0
 		fi
 	fi	
-	if kill -0 `cat /var/run/${NAME}.pid`; then
+	if [ -s /var/run/${NAME}.pid ] && kill -0 `cat /var/run/${NAME}.pid`; then
 		return 0
 	else
 		# the PID file might simply not match the cyrmaster process.
@@ -102,7 +102,7 @@
 			pidof /usr/sbin/cyrmaster > /var/run/${NAME}.pid
 			return 0
 		else
-			# no process and no PID file, return failure
+			# no process and/or no PID file, return failure
 			return 1
 		fi
 	fi
@@ -161,6 +161,7 @@
 	if start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
 			--quiet --startas $DAEMON >/dev/null 2>&1 ; then
 		echo "$NAME."
+		rm -f /var/run/${NAME}.pid
 		exit 0
 	else
 		# process running?
@@ -172,6 +173,7 @@
 			# No, return as if stopped a running process 
 			# successfully.
 			echo "."
+			rm -f /var/run/${NAME}.pid
 			exit 0
 		fi
 	fi