From: Sascha Westermann <sascha.westermann@hl-services.de>
Date: Tue, 14 May 2019 09:22:05 +0000 (+0200)
Subject: Fix System-V return codes according to LSB
X-Git-Tag: v2.11.0-rc1~65^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a761adad8acb97b22f3da42c256ae608b80d4b28;p=icinga2

Fix System-V return codes according to LSB

- "status"-calls use different exit codes, refer to http://refspecs.linuxbase.org/LSB_3.0.0/LSB-PDA/LSB-PDA/iniscrptact.html
- the "status"-call in "condrestart" returned an error if the daemon was not running: this has been fixed
---

diff --git a/etc/initsystem/icinga2.init.d.cmake b/etc/initsystem/icinga2.init.d.cmake
index ef3f521f2..49a6ee290 100644
--- a/etc/initsystem/icinga2.init.d.cmake
+++ b/etc/initsystem/icinga2.init.d.cmake
@@ -138,7 +138,7 @@ status() {
 
 	if [ ! -e $ICINGA2_PID_FILE ]; then
 		echo "Not running"
-		exit 7
+		exit 3
 	fi
 
 	pid=`cat $ICINGA2_PID_FILE`
@@ -146,7 +146,7 @@ status() {
 		echo "Running"
 	else
 		echo "Not running"
-		exit 7
+		exit 3
 	fi
 }
 
@@ -168,7 +168,8 @@ case "$1" in
 	start
   ;;
   condrestart)
-	status > /dev/null 2>&1 || exit 0
+	STATUS=$(status > /dev/null 2>&1)
+	if [ $? != 0 ]; then exit 0; fi
 	checkconfig restart fail
 	stop nofail
 	start