Gentoo Archives: gentoo-commits

From: "Wolfram Schlich (wschlich)" <wschlich@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-mail/dovecot/files: dovecot.init dovecot.init-r1
Date: Mon, 21 Apr 2008 17:07:56
Message-Id: E1JnzUf-0002B8-DY@stork.gentoo.org
1 wschlich 08/04/21 17:07:53
2
3 Modified: dovecot.init dovecot.init-r1
4 Log:
5 fix init script dependencies and indention (bug #217941, comment #3)
6 (Portage version: 2.1.5_rc4)
7
8 Revision Changes Path
9 1.6 net-mail/dovecot/files/dovecot.init
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/dovecot/files/dovecot.init?rev=1.6&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/dovecot/files/dovecot.init?rev=1.6&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/dovecot/files/dovecot.init?r1=1.5&r2=1.6
14
15 Index: dovecot.init
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/net-mail/dovecot/files/dovecot.init,v
18 retrieving revision 1.5
19 retrieving revision 1.6
20 diff -u -r1.5 -r1.6
21 --- dovecot.init 2 Nov 2007 13:40:15 -0000 1.5
22 +++ dovecot.init 21 Apr 2008 17:07:52 -0000 1.6
23 @@ -1,33 +1,33 @@
24 #!/sbin/runscript
25 # Copyright 1999-2004 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License, v2 or later
27 -# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/files/dovecot.init,v 1.5 2007/11/02 13:40:15 uberlord Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/files/dovecot.init,v 1.6 2008/04/21 17:07:52 wschlich Exp $
29
30 opts="reload"
31
32 depend() {
33 - need net
34 - after ldap mysql ntp-client ntpd postgresql saslauthd slapd
35 - use logger
36 + need localmount net
37 + after bootmisc ldap mysql ntp-client ntpd postgresql saslauthd slapd
38 + use logger
39 }
40
41 start() {
42 - ebegin "Starting dovecot"
43 - start-stop-daemon --start --exec /usr/sbin/dovecot \
44 + ebegin "Starting dovecot"
45 + start-stop-daemon --start --exec /usr/sbin/dovecot \
46 --pidfile /var/run/dovecot/master.pid
47 - eend $?
48 + eend $?
49 }
50
51 stop() {
52 - ebegin "Stopping dovecot"
53 - start-stop-daemon --stop --exec /usr/sbin/dovecot \
54 + ebegin "Stopping dovecot"
55 + start-stop-daemon --stop --exec /usr/sbin/dovecot \
56 --pidfile /var/run/dovecot/master.pid
57 - eend $?
58 + eend $?
59 }
60
61 reload() {
62 - ebegin "Reloading dovecot configs and restarting auth/login processes"
63 - start-stop-daemon --stop --oknodo --exec /usr/sbin/dovecot \
64 + ebegin "Reloading dovecot configs and restarting auth/login processes"
65 + start-stop-daemon --stop --oknodo --exec /usr/sbin/dovecot \
66 --pidfile /var/run/dovecot/master.pid --signal HUP
67 - eend $?
68 + eend $?
69 }
70
71
72
73 1.2 net-mail/dovecot/files/dovecot.init-r1
74
75 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/dovecot/files/dovecot.init-r1?rev=1.2&view=markup
76 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/dovecot/files/dovecot.init-r1?rev=1.2&content-type=text/plain
77 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-mail/dovecot/files/dovecot.init-r1?r1=1.1&r2=1.2
78
79 Index: dovecot.init-r1
80 ===================================================================
81 RCS file: /var/cvsroot/gentoo-x86/net-mail/dovecot/files/dovecot.init-r1,v
82 retrieving revision 1.1
83 retrieving revision 1.2
84 diff -u -r1.1 -r1.2
85 --- dovecot.init-r1 17 Apr 2008 16:16:21 -0000 1.1
86 +++ dovecot.init-r1 21 Apr 2008 17:07:52 -0000 1.2
87 @@ -1,14 +1,14 @@
88 #!/sbin/runscript
89 # Copyright 1999-2008 Gentoo Foundation
90 # Distributed under the terms of the GNU General Public License, v2 or later
91 -# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/files/dovecot.init-r1,v 1.1 2008/04/17 16:16:21 wschlich Exp $
92 +# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/files/dovecot.init-r1,v 1.2 2008/04/21 17:07:52 wschlich Exp $
93
94 opts="reload"
95
96 depend() {
97 - need net
98 - after ldap mysql ntp-client ntpd postgresql saslauthd slapd
99 - use logger
100 + need localmount net
101 + after bootmisc ldap mysql ntp-client ntpd postgresql saslauthd slapd
102 + use logger
103 }
104
105 checkconfig() {
106 @@ -34,23 +34,23 @@
107
108 start() {
109 checkconfig || return 1
110 - ebegin "Starting ${SVCNAME}"
111 - start-stop-daemon --start --exec /usr/sbin/dovecot \
112 + ebegin "Starting ${SVCNAME}"
113 + start-stop-daemon --start --exec /usr/sbin/dovecot \
114 --pidfile "${DOVECOT_PIDFILE}" -- -c "${DOVECOT_CONF}"
115 - eend $?
116 + eend $?
117 }
118
119 stop() {
120 checkconfig || return 1
121 - ebegin "Stopping ${SVCNAME}"
122 - start-stop-daemon --stop --exec /usr/sbin/dovecot \
123 + ebegin "Stopping ${SVCNAME}"
124 + start-stop-daemon --stop --exec /usr/sbin/dovecot \
125 --pidfile "${DOVECOT_PIDFILE}"
126 - eend $?
127 + eend $?
128 }
129
130 reload() {
131 - ebegin "Reloading ${SVCNAME} configs and restarting auth/login processes"
132 - start-stop-daemon --stop --oknodo --exec /usr/sbin/dovecot \
133 + ebegin "Reloading ${SVCNAME} configs and restarting auth/login processes"
134 + start-stop-daemon --stop --oknodo --exec /usr/sbin/dovecot \
135 --pidfile "${DOVECOT_PIDFILE}" --signal HUP
136 - eend $?
137 + eend $?
138 }
139
140
141
142 --
143 gentoo-commits@l.g.o mailing list