Fixed init scripts to not use s-s-d's deprecated -c/--chuid option anymore

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

4 files changed, 16 insertions, 10 deletions

diff --git a/net-analyzer/zabbix/ChangeLog b/net-analyzer/zabbix/ChangeLog
index a048c37ba5c9..eb103c269e10 100644
--- a/net-analyzer/zabbix/ChangeLog
+++ b/net-analyzer/zabbix/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/zabbix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.70 2011/12/30 08:26:50 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/zabbix/ChangeLog,v 1.71 2011/12/30 09:46:32 polynomial-c Exp $
+
+  30 Dec 2011; Lars Wendler <polynomial-c@gentoo.org>
+  files/1.6.6/init.d/zabbix-agentd, files/1.6.6/init.d/zabbix-proxy,
+  files/1.6.6/init.d/zabbix-server:
+  non-maintainer commit: Fixed init scripts to not use s-s-d's deprecated
+  -c/--chuid option anymore. Acked by bonsaikitten.
 
 *zabbix-1.8.10 (30 Dec 2011)
 
diff --git a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd
index b14b5fe74b31..b77e792bbd30 100644
--- a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd
+++ b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-agentd
@@ -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.6/init.d/zabbix-agentd,v 1.1 2009/10/05 15:55:23 patrick Exp $
+# $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 $
 
 depend() {
 	need net
@@ -11,7 +11,7 @@ depend() {
 
 start() {
 	ebegin "Starting Zabbix agent"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_agentd
+	start-stop-daemon --start -u zabbix:zabbix --exec /usr/sbin/zabbix_agentd
 	eend $?
 }
 
diff --git a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy
index 8ac246eccdb1..912a013baf79 100644
--- a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy
+++ b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-proxy
@@ -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.6/init.d/zabbix-proxy,v 1.1 2009/10/06 16:24:35 patrick Exp $
+# $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 $
 
 depend() {
 	need net
@@ -10,7 +10,7 @@ depend() {
 
 start() {
 	ebegin "Starting Zabbix proxy"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_proxy
+	start-stop-daemon --start -u zabbix:zabbix --exec /usr/sbin/zabbix_proxy
 	eend $?
 }
 
diff --git a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server
index a661cd233d25..fccab4a1ecd3 100644
--- a/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server
+++ b/net-analyzer/zabbix/files/1.6.6/init.d/zabbix-server
@@ -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.6/init.d/zabbix-server,v 1.1 2009/10/05 15:55:23 patrick Exp $
+# $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 $
 
 depend() {
 	need net
@@ -10,7 +10,7 @@ depend() {
 
 start() {
 	ebegin "Starting Zabbix server"
-	start-stop-daemon --start -c zabbix:zabbix --exec /usr/sbin/zabbix_server
+	start-stop-daemon --start -u zabbix:zabbix --exec /usr/sbin/zabbix_server
 	eend $?
 }