[Pkg-apache-commits] r1284 - in /branches/squeeze-apache2: apache2.2-common.apache2.init changelog

[sf at alioth.debian.org]

Author: sf
Date: Sat Feb 26 14:12:23 2011
New Revision: 1284

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1284
Log:
Make exit code of '/etc/init.d/apache2 status' more LSB compatible.

Modified:
    branches/squeeze-apache2/apache2.2-common.apache2.init
    branches/squeeze-apache2/changelog

Modified: branches/squeeze-apache2/apache2.2-common.apache2.init
URL: http://svn.debian.org/wsvn/pkg-apache/branches/squeeze-apache2/apache2.2-common.apache2.init?rev=1284&op=diff
==============================================================================
--- branches/squeeze-apache2/apache2.2-common.apache2.init (original)
+++ branches/squeeze-apache2/apache2.2-common.apache2.init Sat Feb 26 14:12:23 2011
@@ -266,7 +266,11 @@
 			exit 0
 		else
 			echo "Apache2$DIR_SUFFIX is NOT running."
-			exit 1
+			if [ -e "$PIDFILE" ]; then
+				exit 1
+			else
+				exit 3
+			fi
 		fi
 	;;
 	*)

Modified: branches/squeeze-apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/branches/squeeze-apache2/changelog?rev=1284&op=diff
==============================================================================
--- branches/squeeze-apache2/changelog (original)
+++ branches/squeeze-apache2/changelog Sat Feb 26 14:12:23 2011
@@ -1,5 +1,7 @@
 apache2 (2.2.16-6+squeeze1) UNRELEASED; urgency=low
 
+  * Make exit code of '/etc/init.d/apache2 status' more LSB compatible.
+    Closes: #613969
   * Add hint in README.Debian about 403 error with mod_dav PUT.
     Closes: #613438