Gentoo Archives: gentoo-commits

From: "Robin H. Johnson (robbat2)" <robbat2@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-analyzer/icinga/files: icinga-init.d ido2db-init.d
Date: Sat, 03 Nov 2012 22:15:23
Message-Id: 20121103221506.3D0E2215F3@flycatcher.gentoo.org
1 robbat2 12/11/03 22:15:06
2
3 Modified: icinga-init.d ido2db-init.d
4 Log:
5 ido2db/icinga init.d order is wrong. Correct start: icinga, ido2db; Shutdown: ido2db, icinga. Detected on infra deployment of icinga.
6
7 (Portage version: 2.2.0_alpha142/cvs/Linux x86_64, unsigned Manifest commit)
8
9 Revision Changes Path
10 1.5 net-analyzer/icinga/files/icinga-init.d
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga/files/icinga-init.d?rev=1.5&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga/files/icinga-init.d?rev=1.5&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga/files/icinga-init.d?r1=1.4&r2=1.5
15
16 Index: icinga-init.d
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/icinga/files/icinga-init.d,v
19 retrieving revision 1.4
20 retrieving revision 1.5
21 diff -p -w -b -B -u -u -r1.4 -r1.5
22 --- icinga-init.d 17 Sep 2012 19:53:22 -0000 1.4
23 +++ icinga-init.d 3 Nov 2012 22:15:06 -0000 1.5
24 @@ -1,7 +1,7 @@
25 #!/sbin/runscript
26 # Copyright 1999-2012 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/files/icinga-init.d,v 1.4 2012/09/17 19:53:22 prometheanfire Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/files/icinga-init.d,v 1.5 2012/11/03 22:15:06 robbat2 Exp $
30
31 : ${ICINGACFG:=/etc/icinga/icinga.cfg}
32
33 @@ -22,7 +22,7 @@ start_stop_daemon_args="-e HOME=/var/lib
34
35 depend() {
36 need net
37 - use dns logger firewall mysql postgresql ido2db
38 + use dns logger firewall mysql postgresql
39 }
40
41 checkconfig() {
42
43
44
45 1.5 net-analyzer/icinga/files/ido2db-init.d
46
47 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga/files/ido2db-init.d?rev=1.5&view=markup
48 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga/files/ido2db-init.d?rev=1.5&content-type=text/plain
49 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/icinga/files/ido2db-init.d?r1=1.4&r2=1.5
50
51 Index: ido2db-init.d
52 ===================================================================
53 RCS file: /var/cvsroot/gentoo-x86/net-analyzer/icinga/files/ido2db-init.d,v
54 retrieving revision 1.4
55 retrieving revision 1.5
56 diff -p -w -b -B -u -u -r1.4 -r1.5
57 --- ido2db-init.d 17 Sep 2012 19:53:22 -0000 1.4
58 +++ ido2db-init.d 3 Nov 2012 22:15:06 -0000 1.5
59 @@ -1,7 +1,7 @@
60 #!/sbin/runscript
61 # Copyright 1999-2012 Gentoo Foundation
62 # Distributed under the terms of the GNU General Public License v2
63 -# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/files/ido2db-init.d,v 1.4 2012/09/17 19:53:22 prometheanfire Exp $
64 +# $Header: /var/cvsroot/gentoo-x86/net-analyzer/icinga/files/ido2db-init.d,v 1.5 2012/11/03 22:15:06 robbat2 Exp $
65
66 get_config() {
67 if [ -e "${IDO2DBCFG}" ]; then
68 @@ -16,7 +16,7 @@ pidfile="$(get_config lock_file)"
69 depend() {
70 config "${IDO2DBCFG}"
71
72 - need net
73 + need net icinga
74 use dns logger firewall
75
76 case $(get_config db_servertype) in