[Pkg-Cyrus-imapd-Debian-devel] [SVN] r161 - 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: Mon Aug 29 18:12:43 2005
New Revision: 161

URL: https://mail.incase.de/viewcvs?root=cyrus22?view=rev&rev=161
Log:
Document changes to init script in debian changelog, fix small init script problems introduced with prior patch
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=161&p1=trunk/cyrus-imapd-2.2.12/debian/changelog&r1=160&p2=trunk/cyrus-imapd-2.2.12/debian/changelog&r2=161
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/changelog (original)
+++ trunk/cyrus-imapd-2.2.12/debian/changelog Mon Aug 29 18:12:43 2005
@@ -7,8 +7,10 @@
     than 10 minutes (because that is what the standard says it should be at).
     I needed this change for use at my workplace though. The patch is disabled
     by default.
+  * Patched init script to support everything LSB 3.0 asks for, including the
+    "right" return codes, as far as we can.
 
- -- Sven Mueller <debian at incase.de>  Fri, 15 Jul 2005 17:00:24 +0200
+ -- Sven Mueller <debian at incase.de>  Mon, 29 Aug 2005 18:10:47 +0200
 
 cyrus22-imapd (2.2.12-0.5) unstable; urgency=low
 

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=161&p1=trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.cyrus22.init&r1=160&p2=trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.cyrus22.init&r2=161
==============================================================================
--- trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.cyrus22.init (original)
+++ trunk/cyrus-imapd-2.2.12/debian/cyrus22-common.cyrus22.init Mon Aug 29 18:12:43 2005
@@ -80,7 +80,7 @@
 		|| createdir $dir
 }
 
-checkstatus () {
+check_status () {
 	if [ ! -f /var/run/${NAME}.pid ]; then
 		# using [c] in the grep avoids catching the grep 
 		# process itself
@@ -88,14 +88,23 @@
 			# Damn, PID file doesn't exist, but cyrmaster process
 			# exists. Though strictly speaking, we should not
 			# do this, reconstruct the PID file here.
-			pidof /usr/sbin/cyrmaster > /var/run/${NAME}.pid
+			pidof /usr/sbin/cyrmaster > /dev/null 2>&1 \
+			&& pidof /usr/sbin/cyrmaster > /var/run/${NAME}.pid
 			return 0
 		fi
 	fi	
 	if kill -0 `cat /var/run/${NAME}.pid`; then
 		return 0
 	else
-		return 1
+		# the PID file might simply not match the cyrmaster process.
+		if pidof /usr/sbin/cyrmaster > /dev/null 2>&1 ; then
+			# go ahead and fix it
+			pidof /usr/sbin/cyrmaster > /var/run/${NAME}.pid
+			return 0
+		else
+			# no process and no PID file, return failure
+			return 1
+		fi
 	fi
 	# this point should never be reached, return unknown status if it 
 	# is anyway