[gentoo-commits] gentoo-x86 commit in net-analyzer/zabbix/files/1.6.5/init.d: zabbix-server zabbix-agentd

[gentoo-commits] gentoo-x86 commit in net-analyzer/zabbix/files/1.6.5/init.d: zabbix-server zabbix-agentd

[Christian Ruppert (idl0r)]

idl0r       11/12/31 20:47:13

  Modified:             zabbix-server zabbix-agentd
  Log:
  Revbump. Don't use deprecated start-stop-daemon options, bug 376865.
  
  (Portage version: 2.1.10.41/cvs/Linux i686, RepoMan options: --force)

Revision  Changes    Path
1.2                  net-analyzer/zabbix/files/1.6.5/init.d/zabbix-server

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
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
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

Index: zabbix-server
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-server,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zabbix-server	1 Sep 2009 13:41:33 -0000	1.1
+++ zabbix-server	31 Dec 2011 20:47:13 -0000	1.2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
 depend() {
 	need net
@@ -10,12 +10,12 @@
 
 start() {
 	ebegin "Starting Zabbix server"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_server
+	start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_server
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Zabbix server"
-	start-stop-daemon --stop -u zabbix --pidfile /var/run/zabbix/zabbix_server.pid
+	start-stop-daemon --stop --pidfile /var/run/zabbix/zabbix_server.pid
 	eend $?
 }



1.2                  net-analyzer/zabbix/files/1.6.5/init.d/zabbix-agentd

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
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
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

Index: zabbix-agentd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/files/1.6.5/init.d/zabbix-agentd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zabbix-agentd	1 Sep 2009 13:41:33 -0000	1.1
+++ zabbix-agentd	31 Dec 2011 20:47:13 -0000	1.2
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $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 $
+# $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 $
 
 depend() {
 	need net
@@ -11,12 +11,12 @@
 
 start() {
 	ebegin "Starting Zabbix agent"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_agentd
+	start-stop-daemon --start --user zabbix --group zabbix --exec /usr/sbin/zabbix_agentd
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping Zabbix agent"
-	start-stop-daemon  --stop -u zabbix --pidfile /var/run/zabbix/zabbix_agentd.pid
+	start-stop-daemon  --stop --pidfile /var/run/zabbix/zabbix_agentd.pid
 	eend $?
 }