Blob Blame History Raw
diff -up ./daemon-init.in.fix_el6_init ./daemon-init.in
--- ./daemon-init.in.fix_el6_init	2017-08-24 17:43:48.000000000 -0400
+++ ./daemon-init.in	2017-09-19 15:40:15.143418046 -0400
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# chkconfig: 345 99 01
+# chkconfig: - 99 01
 # description: Nagios network monitor
 # processname: nagios
 # File : nagios
@@ -96,7 +96,7 @@ check_config ()
 		exit 8
 	fi
 
-	TMPFILE=$(mktemp /tmp/.configtest.XXXXXXXX)
+        TMPFILE=$(mktemp $NagiosCfgtestFile.XXX )
 	$NagiosBin -vp $NagiosCfgFile > "$TMPFILE"
 	WARN=`grep ^"Total Warnings:" "$TMPFILE" |awk -F: '{print \$2}' |sed s/' '//g`
 	ERR=`grep ^"Total Errors:" "$TMPFILE" |awk -F: '{print \$2}' |sed s/' '//g`
@@ -134,11 +134,14 @@ status_nagios ()
 
 printstatus_nagios ()
 {
-	if status_nagios; then
+	status_nagios $1 $2
+	RETVAL=$?
+	if [ $RETVAL = 0 ]; then
 		echo "nagios (pid $NagiosPID) is running..."
 	else
 		echo "nagios is not running"
 	fi
+	 return $RETVAL
 }
 
 killproc_nagios ()
@@ -251,6 +254,7 @@ case "$1" in
 	status)
 		pid_nagios
 		printstatus_nagios
+		 exit $?
 		;;
 
 	checkconfig)
@@ -305,6 +309,7 @@ case "$1" in
 	*)
 		echo "Usage: nagios {start|stop|restart|reload|force-reload|status|checkconfig|configtest}"
 		exit 1
+		exit 2
 		;;
 
 esac