1 |
idl0r 11/12/31 20:47:13 |
2 |
|
3 |
Modified: zabbix-agentd zabbix-server zabbix-proxy |
4 |
Log: |
5 |
Revbump. Don't use deprecated start-stop-daemon options, bug 376865. |
6 |
|
7 |
(Portage version: 2.1.10.41/cvs/Linux i686, RepoMan options: --force) |
8 |
|
9 |
Revision Changes Path |
10 |
1.3 net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd?rev=1.3&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd?rev=1.3&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd?r1=1.2&r2=1.3 |
15 |
|
16 |
Index: zabbix-agentd |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd,v |
19 |
retrieving revision 1.2 |
20 |
retrieving revision 1.3 |
21 |
diff -u -r1.2 -r1.3 |
22 |
--- zabbix-agentd 30 Dec 2011 09:46:32 -0000 1.2 |
23 |
+++ zabbix-agentd 31 Dec 2011 20:47:13 -0000 1.3 |
24 |
@@ -1,7 +1,7 @@ |
25 |
#!/sbin/runscript |
26 |
# Copyright 1999-2011 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd,v 1.2 2011/12/30 09:46:32 polynomial-c Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd,v 1.3 2011/12/31 20:47:13 idl0r Exp $ |
30 |
|
31 |
depend() { |
32 |
need net |
33 |
@@ -11,12 +11,12 @@ |
34 |
|
35 |
start() { |
36 |
ebegin "Starting Zabbix agent" |
37 |
- start-stop-daemon --start -u zabbix:zabbix --exec /usr/sbin/zabbix_agentd |
38 |
+ start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd |
39 |
eend $? |
40 |
} |
41 |
|
42 |
stop() { |
43 |
ebegin "Stopping Zabbix agent" |
44 |
- start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_agentd.pid |
45 |
+ start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_agentd.pid |
46 |
eend $? |
47 |
} |
48 |
|
49 |
|
50 |
|
51 |
1.3 net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server |
52 |
|
53 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server?rev=1.3&view=markup |
54 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server?rev=1.3&content-type=text/plain |
55 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server?r1=1.2&r2=1.3 |
56 |
|
57 |
Index: zabbix-server |
58 |
=================================================================== |
59 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server,v |
60 |
retrieving revision 1.2 |
61 |
retrieving revision 1.3 |
62 |
diff -u -r1.2 -r1.3 |
63 |
--- zabbix-server 30 Dec 2011 09:46:32 -0000 1.2 |
64 |
+++ zabbix-server 31 Dec 2011 20:47:13 -0000 1.3 |
65 |
@@ -1,7 +1,7 @@ |
66 |
#!/sbin/runscript |
67 |
# Copyright 1999-2011 Gentoo Foundation |
68 |
# Distributed under the terms of the GNU General Public License v2 |
69 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server,v 1.2 2011/12/30 09:46:32 polynomial-c Exp $ |
70 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server,v 1.3 2011/12/31 20:47:13 idl0r Exp $ |
71 |
|
72 |
depend() { |
73 |
need net |
74 |
@@ -10,12 +10,12 @@ |
75 |
|
76 |
start() { |
77 |
ebegin "Starting Zabbix server" |
78 |
- start-stop-daemon --start -u zabbix:zabbix --exec /usr/sbin/zabbix_server |
79 |
+ start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_server |
80 |
eend $? |
81 |
} |
82 |
|
83 |
stop() { |
84 |
ebegin "Stopping Zabbix server" |
85 |
- start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_server.pid |
86 |
+ start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_server.pid |
87 |
eend $? |
88 |
} |
89 |
|
90 |
|
91 |
|
92 |
1.3 net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy |
93 |
|
94 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy?rev=1.3&view=markup |
95 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy?rev=1.3&content-type=text/plain |
96 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy?r1=1.2&r2=1.3 |
97 |
|
98 |
Index: zabbix-proxy |
99 |
=================================================================== |
100 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy,v |
101 |
retrieving revision 1.2 |
102 |
retrieving revision 1.3 |
103 |
diff -u -r1.2 -r1.3 |
104 |
--- zabbix-proxy 30 Dec 2011 09:46:32 -0000 1.2 |
105 |
+++ zabbix-proxy 31 Dec 2011 20:47:13 -0000 1.3 |
106 |
@@ -1,7 +1,7 @@ |
107 |
#!/sbin/runscript |
108 |
# Copyright 1999-2011 Gentoo Foundation |
109 |
# Distributed under the terms of the GNU General Public License v2 |
110 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy,v 1.2 2011/12/30 09:46:32 polynomial-c Exp $ |
111 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy,v 1.3 2011/12/31 20:47:13 idl0r Exp $ |
112 |
|
113 |
depend() { |
114 |
need net |
115 |
@@ -10,12 +10,12 @@ |
116 |
|
117 |
start() { |
118 |
ebegin "Starting Zabbix proxy" |
119 |
- start-stop-daemon --start -u zabbix:zabbix --exec /usr/sbin/zabbix_proxy |
120 |
+ start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_proxy |
121 |
eend $? |
122 |
} |
123 |
|
124 |
stop() { |
125 |
ebegin "Stopping Zabbix proxy" |
126 |
- start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_proxy.pid |
127 |
+ start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_proxy.pid |
128 |
eend $? |
129 |
} |