- back to old stopping method but print errors on failure

diff --git a/ejabberd.init b/ejabberd.init
index 447e7d5ac88897bb4fc0a5da63d4fd7d1f356857..f78fb6c4c671f3fd30a5d2ba28c84f405174792c 100644 (file)
--- a/ejabberd.init
+++ b/ejabberd.init
@@ -38,14 +38,20 @@ start() {
 stop() {
        # Stop daemons.
        if [ -f /var/lock/subsys/ejabberd ]; then
-               msg_stopping ejabberd
-               daemon /usr/sbin/ejabberdctl stop
+               msg_stopping ejabberd ; busy
+               out=$(/usr/sbin/ejabberdctl stop 2>&1)
                RETVAL=$?
                if [ $RETVAL -eq 0 ]; then
-                       msg_starting "ejabberd stop confirmation"
-                       daemon /usr/sbin/ejabberdctl stopped
+                       out2=$(/usr/sbin/ejabberdctl stopped 2>&1)
                        RETVAL=$?
                fi
+               if [ $RETVAL -eq 0 ]; then
+                       ok
+               else
+                       fail
+                       [ -n "$out" ] && echo $out
+                       [ -n "$out2" ] && echo $out2
+               fi
                rm -f /var/lock/subsys/ejabberd
        else
                msg_not_running ejabberd