[apache2] 01/03: Don't wait for apache to start if it returned an error

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository apache2.

commit fc188c28e2ecd7310d17381527b0dd32df6eaecb
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon Dec 22 21:19:22 2014 +0100

    Don't wait for apache to start if it returned an error
---
 debian/apache2.init | 8 ++++++++
 debian/changelog    | 1 +
 2 files changed, 9 insertions(+)

diff --git a/debian/apache2.init b/debian/apache2.init
index e9aa407..1e25bf0 100755
--- a/debian/apache2.init
+++ b/debian/apache2.init
@@ -116,6 +116,10 @@ print_error_msg() {
 apache_wait_start() {
 	local STATUS=$1
 	local i=0
+
+	if [ $STATUS != 0 ] ; then
+	        return $STATUS
+	fi
 	while : ; do
 	        PIDTMP=$(pidofproc -p $PIDFILE $DAEMON)
 	        if [ -n "${PIDTMP:-}" ] && kill -0 "${PIDTMP:-}" 2> /dev/null; then
@@ -136,6 +140,10 @@ apache_wait_start() {
 apache_wait_stop() {
 	local STATUS=$1
 
+	if [ $STATUS != 0 ] ; then
+	        return $STATUS
+	fi
+
 	PIDTMP=$(pidofproc -p $PIDFILE $DAEMON)
 	if [ -n "${PIDTMP:-}" ] && kill -0 "${PIDTMP:-}" 2> /dev/null; then
 	        local i=0
diff --git a/debian/changelog b/debian/changelog
index 98712d4..82e8e12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ apache2 (2.4.10-9) UNRELEASED; urgency=medium
   * Include ask-for-passphrase script from Ubuntu with some tweaks. This
     fixes asking for certificate passphrases if started via systemd.
     Closes: #773405
+  * Fix init script to not wait 20s if passphrase was wrong.
   * Also bump debhelper build-depends to get dh_installdeb with support for
     symlink_to_dir. Closes: #770421
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git