From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Fri, 16 Nov 2012 15:22:32 +0000 (+0100)
Subject: Bug 556195: bugzilla-queue.rhel initscript returns wrong result code when the daemon... 
X-Git-Tag: bugzilla-4.5.1~310
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a565b2c1fb2fc0002b2e1b7a174da9e7bd150ac;p=thirdparty%2Fbugzilla.git

Bug 556195: bugzilla-queue.rhel initscript returns wrong result code when the daemon isn't running
r=justdave a=LpSolit
---

diff --git a/contrib/bugzilla-queue.rhel b/contrib/bugzilla-queue.rhel
index fe107b8ba7..b7a39fe810 100755
--- a/contrib/bugzilla-queue.rhel
+++ b/contrib/bugzilla-queue.rhel
@@ -70,7 +70,7 @@ usage ()
 start ()
 {
     if [ -f "$PIDFILE" ]; then
-	checkpid `cat $PIDFILE` && return 0
+	checkpid `cat $PIDFILE` && return 2
     fi
     echo -n "Starting $NAME: "
     touch $PIDFILE
@@ -85,7 +85,7 @@ start ()
 
 stop ()
 {
-    [ -f /var/lock/subsys/$NAME ] || return 0
+    [ -f /var/lock/subsys/$NAME ] || return 2
     echo -n "Killing $NAME: "
     killproc $NAME
     echo
@@ -100,7 +100,7 @@ restart ()
 
 condrestart ()
 {
-    [ -e /var/lock/subsys/$NAME ] && restart || return 0
+    [ -e /var/lock/subsys/$NAME ] && restart || return 2
 }
 
 
@@ -110,7 +110,7 @@ case "$1" in
     status) $BIN -p $PIDFILE -n $NAME check; RETVAL=$?;;
     restart) restart; RETVAL=$? ;;
     condrestart) condrestart; RETVAL=$? ;;
-    *) usage ; RETVAL=2 ;;
+    *) usage ;;
 esac
 
 exit $RETVAL