From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 8 Jul 2010 11:31:51 +0000 (+0200)
Subject: Always log if init script fails to start or stop
X-Git-Tag: v1.2.0~3
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=31977dc8d6996d2de009d62739ee5f688ba77504;p=metaproxy-moved-to-github.git

Always log if init script fails to start or stop

This fixes bug #3309. The init.d script will log despite the
value of VERBOSE if start-stop-daemon returns exit code 2.
---

diff --git a/debian/metaproxy.init b/debian/metaproxy.init
index 90f558b..0fb2f26 100644
--- a/debian/metaproxy.init
+++ b/debian/metaproxy.init
@@ -96,7 +96,10 @@ case "$1" in
 	do_start
 	case "$?" in
 		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+		2) [ "$VERBOSE" = no ] && \
+				log_daemon_msg "Starting $DESC" "$NAME"
+			log_end_msg 1 
+		;;
 	esac
 	;;
   stop)
@@ -104,7 +107,10 @@ case "$1" in
 	do_stop
 	case "$?" in
 		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+		2) [ "$VERBOSE" = no ] && \
+				log_daemon_msg "Stopping $DESC" "$NAME"
+			log_end_msg 1 
+		;;
 	esac
 	;;
   #reload|force-reload)