1 |
idl0r 11/12/31 20:47:13 |
2 |
|
3 |
Modified: zabbix-server zabbix-agentd |
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.2 net-analyzer/zabbix/files/1.6.5/init.d/zabbix-server |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-server?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-server?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-server?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: zabbix-server |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-server,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- zabbix-server 1 Sep 2009 13:41:33 -0000 1.1 |
23 |
+++ zabbix-server 31 Dec 2011 20:47:13 -0000 1.2 |
24 |
@@ -1,7 +1,7 @@ |
25 |
#!/sbin/runscript |
26 |
-# Copyright 1999-2007 Gentoo Foundation |
27 |
+# Copyright 1999-2011 Gentoo Foundation |
28 |
# Distributed under the terms of the GNU General Public License v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-server,v 1.1 2009/09/01 13:41:33 patrick Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-server,v 1.2 2011/12/31 20:47:13 idl0r Exp $ |
31 |
|
32 |
depend() { |
33 |
need net |
34 |
@@ -10,12 +10,12 @@ |
35 |
|
36 |
start() { |
37 |
ebegin "Starting Zabbix server" |
38 |
- start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_server |
39 |
+ start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_server |
40 |
eend $? |
41 |
} |
42 |
|
43 |
stop() { |
44 |
ebegin "Stopping Zabbix server" |
45 |
- start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_server.pid |
46 |
+ start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_server.pid |
47 |
eend $? |
48 |
} |
49 |
|
50 |
|
51 |
|
52 |
1.2 net-analyzer/zabbix/files/1.6.5/init.d/zabbix-agentd |
53 |
|
54 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-agentd?rev=1.2&view=markup |
55 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-agentd?rev=1.2&content-type=text/plain |
56 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-agentd?r1=1.1&r2=1.2 |
57 |
|
58 |
Index: zabbix-agentd |
59 |
=================================================================== |
60 |
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-agentd,v |
61 |
retrieving revision 1.1 |
62 |
retrieving revision 1.2 |
63 |
diff -u -r1.1 -r1.2 |
64 |
--- zabbix-agentd 1 Sep 2009 13:41:33 -0000 1.1 |
65 |
+++ zabbix-agentd 31 Dec 2011 20:47:13 -0000 1.2 |
66 |
@@ -1,7 +1,7 @@ |
67 |
#!/sbin/runscript |
68 |
-# Copyright 1999-2007 Gentoo Foundation |
69 |
+# Copyright 1999-2011 Gentoo Foundation |
70 |
# Distributed under the terms of the GNU General Public License v2 |
71 |
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-agentd,v 1.1 2009/09/01 13:41:33 patrick Exp $ |
72 |
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-agentd,v 1.2 2011/12/31 20:47:13 idl0r Exp $ |
73 |
|
74 |
depend() { |
75 |
need net |
76 |
@@ -11,12 +11,12 @@ |
77 |
|
78 |
start() { |
79 |
ebegin "Starting Zabbix agent" |
80 |
- start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_agentd |
81 |
+ start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd |
82 |
eend $? |
83 |
} |
84 |
|
85 |
stop() { |
86 |
ebegin "Stopping Zabbix agent" |
87 |
- start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_agentd.pid |
88 |
+ start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_agentd.pid |
89 |
eend $? |
90 |
} |