Gentoo Archives: gentoo-commits

From: "Eray Aslan (eras)" <eras@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in mail-filter/amavisd-new/files: amavisd.initd
Date: Fri, 06 Jan 2012 11:38:44
Message-Id: 20120106113835.8B61F2004C@flycatcher.gentoo.org
1 eras 12/01/06 11:38:35
2
3 Modified: amavisd.initd
4 Log:
5 fix in init script - bug #397763
6
7 (Portage version: 2.1.10.44/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.3 mail-filter/amavisd-new/files/amavisd.initd
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd?rev=1.3&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd?rev=1.3&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd?r1=1.2&r2=1.3
15
16 Index: amavisd.initd
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd,v
19 retrieving revision 1.2
20 retrieving revision 1.3
21 diff -u -r1.2 -r1.3
22 --- amavisd.initd 7 Dec 2010 10:34:32 -0000 1.2
23 +++ amavisd.initd 6 Jan 2012 11:38:35 -0000 1.3
24 @@ -1,9 +1,10 @@
25 #!/sbin/runscript
26 -# Copyright 1999-2010 Gentoo Foundation
27 +# Copyright 1999-2012 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd,v 1.2 2010/12/07 10:34:32 eras Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/mail-filter/amavisd-new/files/amavisd.initd,v 1.3 2012/01/06 11:38:35 eras Exp $
31
32 -opts="${opts} reload debug debug_sa"
33 +extra_started_commands="reload"
34 +extra_commands="debug debug_sa"
35
36 prog="/usr/sbin/amavisd"
37 progname="amavisd-new"
38 @@ -20,7 +21,7 @@
39 if [ -r "${conffile}" ] ; then
40 pidfile=$(grep -m1 ^[^#].*pid_file "${conffile}"|sed -e 's/.*"\(.*\)".*/\1/')
41 piddir=${pidfile%/*}
42 - if [ ! -d "${piddir:-/var/amavis}" ] ; then
43 + if [ ! -d "${piddir:=/var/amavis}" ] ; then
44 checkpath -q -d -o root:amavis -m 0770 "${piddir}" || return 1
45 fi
46 else