From: | "Peter Volkov (pva)" <pva@g.o> |
---|---|
To: | gentoo-commits@l.g.o |
Subject: | [gentoo-commits] gentoo-x86 commit in net-im/ejabberd/files: ejabberd-3.initd |
Date: | Wed, 02 Jun 2010 07:12:32 |
Message-Id: | 20100602071227.8AD312C3ED@corvid.gentoo.org |
1 | pva 10/06/02 07:12:27 |
2 | |
3 | Modified: ejabberd-3.initd |
4 | Log: |
5 | Make stop at init script working again, thank krigstask for report. |
6 | (Portage version: 2.1.8.3/cvs/Linux x86_64) |
7 | |
8 | Revision Changes Path |
9 | 1.3 net-im/ejabberd/files/ejabberd-3.initd |
10 | |
11 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/files/ejabberd-3.initd?rev=1.3&view=markup |
12 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/files/ejabberd-3.initd?rev=1.3&content-type=text/plain |
13 | diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/files/ejabberd-3.initd?r1=1.2&r2=1.3 |
14 | |
15 | Index: ejabberd-3.initd |
16 | =================================================================== |
17 | RCS file: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-3.initd,v |
18 | retrieving revision 1.2 |
19 | retrieving revision 1.3 |
20 | diff -u -r1.2 -r1.3 |
21 | --- ejabberd-3.initd 28 May 2010 10:52:20 -0000 1.2 |
22 | +++ ejabberd-3.initd 2 Jun 2010 07:12:27 -0000 1.3 |
23 | @@ -1,7 +1,7 @@ |
24 | #!/sbin/runscript |
25 | # Copyright 1999-2010 Gentoo Foundation |
26 | # Distributed under the terms of the GNU General Public License v2 |
27 | -# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-3.initd,v 1.2 2010/05/28 10:52:20 pva Exp $ |
28 | +# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/files/ejabberd-3.initd,v 1.3 2010/06/02 07:12:27 pva Exp $ |
29 | |
30 | depend() { |
31 | use dns |
32 | @@ -20,7 +20,8 @@ |
33 | } |
34 | |
35 | stop() { |
36 | - if ejabberdctl status >/dev/null 2>&1 || test $? = 3; then |
37 | + ejabberdctl status >/dev/null 2>&1 |
38 | + if test $? = 3; then |
39 | ewarn "ejabberd is already stopped (manually?)." |
40 | return 0 |
41 | fi |