X-Git-Url: https://git.tld-linux.org/?p=packages%2Fzabbix.git;a=blobdiff_plain;f=zabbix_agent2.init;fp=zabbix_agent2.init;h=0802fb17c4943f3cbe385403e47081d0621c4814;hp=f4885d1cfd12f4dd1599d2259046d0a70672e294;hb=ecf728f74c6981c13a08c2f726e0673c5a53fae5;hpb=bf5de5699a130527eb2f5b7a93fafcc1f4cc3fe4

diff --git a/zabbix_agent2.init b/zabbix_agent2.init
index f4885d1..0802fb1 100644
--- a/zabbix_agent2.init
+++ b/zabbix_agent2.init
@@ -24,10 +24,22 @@ else
 	exit 0
 fi
 
+ZABBIX_USER="zabbix"
+
 # Get service config - may override defaults
 [ -f /etc/sysconfig/zabbix_agent2 ] && . /etc/sysconfig/zabbix_agent2
 
-pidfile="/var/run/zabbix/zabbix_agent2.pid"
+# Try to get configured PidFile or set default
+get_pid() {
+	local config="$1"
+	local pidfile
+	test -f "$config" && pidfile=$(awk -F= '/^ *PidFile/ {print $2}' "$config")
+	# Fallback to zabbix_agent2 default pidfile
+	test -n "$pidfile" || pidfile=/tmp/zabbix_agent2.pid
+	echo "$pidfile"
+}
+
+pidfile=$(get_pid /etc/zabbix/zabbix_agent2.conf)
 
 start() {
 	# Check if the service is already running?
@@ -37,7 +49,7 @@ start() {
 	fi
 
 	msg_starting "Zabbix Agent 2"
-	daemon /usr/sbin/zabbix_agent2
+	daemon --fork --user $ZABBIX_USER /usr/sbin/zabbix_agent2
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/zabbix_agent2
 }