- rel 3; stop_kindly is too annoying for users

diff --git a/ejabberd.init b/ejabberd.init
index 878354516b9fd927ee65c281e765780f7fd6eda4..bffcda629961abb83ef6a3df3d7de3bdeab67932 100644 (file)
--- a/ejabberd.init
+++ b/ejabberd.init
@@ -39,7 +39,7 @@ stop() {
        # Stop daemons.
        if [ -f /var/lock/subsys/ejabberd ]; then
                msg_stopping ejabberd ; busy
-               out=$(/bin/su - jabber -s /bin/sh -c "/usr/sbin/ejabberdctl stop_kindly 5 \\\"Server will be stopped now.\\\"" 2>&1)
+               out=$(/bin/su - jabber -s /bin/sh -c "/usr/sbin/ejabberdctl stop" 2>&1)
                RETVAL=$?
                if [ $RETVAL -eq 0 ]; then
                        out2=$(/bin/su - jabber -s /bin/sh -c "/usr/sbin/ejabberdctl stopped" 2>&1)

diff --git a/ejabberd.spec b/ejabberd.spec
index 6b87f5769f426fede7b55fd91368b400bd58d536..e6ac659c9baa173a1a99c16563abf81bbd9e2e9e 100644 (file)
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -8,7 +8,7 @@ Summary:        Fault-tolerant distributed Jabber/XMPP server
 Summary(pl.UTF-8):     Odporny na awarie rozproszony serwer Jabbera/XMPP
 Name:          ejabberd
 Version:       15.09
-Release:       2
+Release:       3
 License:       GPL
 Group:         Applications/Communications
 Source0:       http://www.process-one.net/downloads/ejabberd/%{version}/%{name}-%{version}.tgz