Mail archive
alpine-devel

[alpine-devel] [PATCH] main/zabbix: respect agentd pid file in initd script

From: Johannes Matheis <jomat+alpinebuild_at_jmt.gr>
Date: Sun, 14 Dec 2014 15:40:59 +0000

start-stop-daemon without an (empty) pid file refuses to start zabbix agentd
if there is already one running inside a lxc container
---
 main/zabbix/APKBUILD            | 8 ++++----
 main/zabbix/zabbix-agentd.initd | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/main/zabbix/APKBUILD b/main/zabbix/APKBUILD
index 4ee57e2..aac7684 100644
--- a/main/zabbix/APKBUILD
+++ b/main/zabbix/APKBUILD
_at_@ -3,7 +3,7 @@
 # Maintainer: Natanael Copa <ncopa_at_alpinelinux.org>
 pkgname=zabbix
 pkgver=2.4.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Enterprise-class open source distributed monitoring"
 url="http://www.zabbix.com"
 arch="all"
_at_@ -198,7 +198,7 @@ bf62c539870874e11de39c60cb974786  automake.patch
 40c81bdec85815f4ba637eb6528cc5e8  musl-fix-includes.patch
 8fe442b55584dd5ba784a3140bb980aa  zabbix-server.initd
 bd91d0243cf8f72b86b9bf0b91963663  zabbix-server.confd
-d679ccec92ccc1e7a117b27652e6b856  zabbix-agentd.initd
+b525535848d1842b64b611b3790c4645  zabbix-agentd.initd
 a99978139481e69434f78fc3e8c53441  zabbix-proxy.initd
 c3b399a406f7dd1df0de7b3fae3ed081  002-fix-res_send-on-uclibc.patch"
 sha256sums="dad3ac64176f267b319d77bb0ec2bea0acdce945425f7ae39011cba019a75003  zabbix-2.4.2.tar.gz
_at_@ -211,7 +211,7 @@ b347ca77660e69bea353c50e2fce0c7c4cc837f782c9f84f74ba92c1a62b4c1b  automake.patch
 38b4e1a5d5c16c7d9b31347acf710d84b693f6e1df365d1072548e897e034884  musl-fix-includes.patch
 311a29f05a58cfe67c273f7cf25092fab23423feb07e8ee1344141a146f0ccc3  zabbix-server.initd
 ddf75041fb0afc5b211dd79a934341cc9db4325447ad33a42cbf09bdfb5cad42  zabbix-server.confd
-308149ec35893631f85e1acb7eefed3b2d0e70a0735f2f4f79ebd82615a084f3  zabbix-agentd.initd
+6f9c8769978ad893908d8725a542e39a88addadf0a349450f53a6d96754bee3f  zabbix-agentd.initd
 60a01c08df054a0c1bcfb71e378544b4c4e489e6a6779d96383387ed34ddc0b0  zabbix-proxy.initd
 c796e9aa371f50155b396da53504375f35f77bd3941440525dcaf92da33dac99  002-fix-res_send-on-uclibc.patch"
 sha512sums="9f8576619f2d55c769b060fab8514d59c5a7c7cee79f7cd6d09276721653c1ee472ca422f9c756a36d223ff43d5dda2e2a6669dc2ac617ca172f6954bda98b56  zabbix-2.4.2.tar.gz
_at_@ -224,6 +224,6 @@ b65c6ba7701d98ae7f6fe2124c1d2b8b8fea3c3cc7ee080bf99f5afff0aaa6a025c2a1f5136b4700
 9b87ec1ea4a9cbb501c16012d498cdae82a696f4cd495e1e8cb201d9e31c6e135da5bb264c6273f2de87297bd3e4bd16f66703610686f5d610e3316ee24aac91  musl-fix-includes.patch
 790760ddde503b3cf188fbf58e05587756fbf09c4d3cda8493b3b87b44a9a9ed00d4685045f83249c9714bd8afb6a184412ddfff865c073bbed5c513a78ded1c  zabbix-server.initd
 a91821c6086a1fc0197750cc68073419defcb7d775b11b14a993409a8f61c7a1a0a0af95de27eed9f3b8357f8362640cb1b26b91b56f4f1d714ca6f222d02b80  zabbix-server.confd
-27ca15a421b00588552062e0cddadc8d680469c95be1288f1cf815753db349e2acc846dc51c9596fdf32c55fd249566301e87f65dd053f6a521adec735113ff9  zabbix-agentd.initd
+17cca8f9b4d70fe32976e1b5aa775eb7c2c5433916b7e94a8c3310ba9240aedcea837ae40c286f147f3b1e4de8cdb7b433df80fb3b8d7a36e2b965fc406034b3  zabbix-agentd.initd
 b305ea06641c6a331273f065a4a85fac92c45e107a30e85cb41be4ea36e2efbf5442c69cc6605ea3734a851808f7abba20042058d4b07832d858cdb63e98d405  zabbix-proxy.initd
 cc00603b26a4bd49fba5d8b5e2aaaa7c947c888f4970a4a582a201012aee956f926251eb85236014660fe0b3fa1a22a7ac27b4331e00af64d2a658e972d2d7df  002-fix-res_send-on-uclibc.patch"
diff --git a/main/zabbix/zabbix-agentd.initd b/main/zabbix/zabbix-agentd.initd
index 08e0ffc..29da8dd 100644
--- a/main/zabbix/zabbix-agentd.initd
+++ b/main/zabbix/zabbix-agentd.initd
_at_@ -3,6 +3,7 @@
 # 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 $
 
+# ensure the same file is specified as PidFile in /etc/zabbix/zabbix_agentd.conf
 pidfile=/var/run/zabbix/zabbix_agentd.pid
 user=zabbix
 group=zabbix
_at_@ -20,7 +21,7 @@ depend() {
 
 start() {
 	ebegin "Starting Zabbix agent"
-	start-stop-daemon --start --user ${user}:${group} --exec /usr/sbin/zabbix_agentd
+	start-stop-daemon --pidfile ${pidfile} --start --user ${user}:${group} --exec /usr/sbin/zabbix_agentd
 	eend $?
 }
 
-- 
2.2.0
---
Unsubscribe:  alpine-devel+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-devel+help_at_lists.alpinelinux.org
---
Received on Sun Dec 14 2014 - 15:40:59 UTC