From f58e0a640714fee335065670be34e174f4814bd9 Mon Sep 17 00:00:00 2001
From: Etienne CHAMPETIER <champetier.etienne@gmail.com>
Date: Sun, 21 Jun 2015 16:10:34 +0200
Subject: zabbix: switch zabbix_agentd to procd

run tested on ar71xx

Signed-off-by: Etienne CHAMPETIER <champetier.etienne@gmail.com>
---
 admin/zabbix/files/zabbix_agentd.init | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)
 mode change 100644 => 100755 admin/zabbix/files/zabbix_agentd.init

(limited to 'admin/zabbix/files')

diff --git a/admin/zabbix/files/zabbix_agentd.init b/admin/zabbix/files/zabbix_agentd.init
old mode 100644
new mode 100755
index c806a9f0b..86f1cedea
--- a/admin/zabbix/files/zabbix_agentd.init
+++ b/admin/zabbix/files/zabbix_agentd.init
@@ -3,29 +3,19 @@
 
 START=60
 
+USE_PROCD=1
 PROG=/usr/sbin/zabbix_agentd
 CONFIG=/etc/zabbix_agentd.conf
-SERVICE_PID_FILE=/var/run/zabbix_agentd.pid
 
-start() {
+start_service() {
 	# Sometimes the agentd config was installed in /etc/zabbix/zabbix_agentd.conf
 	[ -f /etc/zabbix/zabbix_agentd.conf ] && mv /etc/zabbix/zabbix_agentd.conf ${CONFIG}
 
 	[ -f ${CONFIG} ] || return 1
 
-	grep -q "^PidFile=${SERVICE_PID_FILE}" ${CONFIG} || {
-		logger -s -t ${CONFIG} -p daemon.error "Only \"PidFile=${SERVICE_PID_FILE}\" supported"
-		return 1
-	}
-
-	grep -q "^AllowRoot=1" ${CONFIG} || {
-		touch ${SERVICE_PID_FILE}
-		chown zabbix:zabbix ${SERVICE_PID_FILE}
-	}
-
-	service_start ${PROG} -c ${CONFIG}
+	procd_open_instance
+	procd_set_param command ${PROG} -c ${CONFIG} -f
+	procd_set_param respawn
+	procd_close_instance
 }
 
-stop() {
-	service_stop ${PROG}
-}
-- 
cgit v1.2.3