Use pidfile for starting and stopping the ganglia daemons. Thanks to Joshua Rich, #333275

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 81 insertions, 6 deletions

diff --git a/sys-cluster/ganglia/ChangeLog b/sys-cluster/ganglia/ChangeLog
index b8f6b7d70ff1..7e43610f2bc2 100644
--- a/sys-cluster/ganglia/ChangeLog
+++ b/sys-cluster/ganglia/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-cluster/ganglia
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.38 2010/07/03 15:34:23 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.39 2010/08/25 01:53:52 jsbronder Exp $
+
+*ganglia-3.1.7-r2 (25 Aug 2010)
+
+  25 Aug 2010; Justin Bronder <jsbronder@gentoo.org> +files/gmetad.rc-2,
+  +files/gmond.rc-2, -ganglia-3.1.7-r1.ebuild, +ganglia-3.1.7-r2.ebuild:
+  Use pidfile for starting and stopping the ganglia daemons. Thanks to
+  Joshua Rich, #333275
 
   03 Jul 2010; Matti Bickel <mabi@gentoo.org> ganglia-3.1.7-r1.ebuild:
   update RDEPEND for php-5.3 (bug #298205)
diff --git a/sys-cluster/ganglia/Manifest b/sys-cluster/ganglia/Manifest
index c8400538239f..722b3d5de7de 100644
--- a/sys-cluster/ganglia/Manifest
+++ b/sys-cluster/ganglia/Manifest
@@ -1,11 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ganglia-3.1.1-ctype-c99.patch 437 RMD160 19083e2102e7ed73725f9800d73e655b84c58dd8 SHA1 bb56f766c475c5d6e23259673e85311887c39c5e SHA256 385397d0e6b3810f19fe420fbb7db70ab9978089fe8388eed2ea6a8d8deafcf8
 AUX ganglia-3.1.1-multidisk-group.patch 482 RMD160 d46699b88fed699c8864b10ebb4eca0a06965a0f SHA1 f942d0427469b9acb51e8eb38de18cdaf80f4b51 SHA256 fd4f3a3798cc99cd0bd93eb238d6c7f381b65c8329852b5a9fa07005c85a6639
 AUX ganglia-3.1.1-process_path-overflow-r1.patch 1364 RMD160 0f04fa5f9cfeae7261352d3d4fab631b0b0283d0 SHA1 5f1a302d40c06ad8af199c09e9e16eda4354b996 SHA256 aedce482577f8a5941e54d8392e223b546c3c69790699b0ee0c9c2e4b5500c46
 AUX gmetad.rc 351 RMD160 e6de86388717e8b8ee5072e45accb8b3cbf98632 SHA1 1cca253192c7c133d5f2f9b6e98c57eca6a41710 SHA256 86a57f6e009cb516928d048180672b82326ba01b8a3deda72e4d03532c493b8e
+AUX gmetad.rc-2 479 RMD160 272c401105d9f06c6871830e5599a938b2f07bc0 SHA1 e468a6eab58c9664fbac19f607cdea4c5cd325b5 SHA256 5d474faa14f0afa84608575bf5796dc9cc1c63b22d6fa8713f823d606e4d9a09
 AUX gmond.rc 345 RMD160 076613bff272ddb1e8e192805edad009e00f2af4 SHA1 bc57ed84f0e0fc92fe46f71e0179a2b5bb028aa4 SHA256 c58568992ddad460a79278aae59d0246b74ae167b70d05885775c51118a8c965
+AUX gmond.rc-2 472 RMD160 ff0f7e7c7a18b2dac3181e87224dc88a19c95015 SHA1 53661f78be1033f7b077dc795e2e4da47748bc71 SHA256 27327531dbae7299efd1afeee61cb2d17a3a1ec999896e1589d5ca89692ab251
 DIST ganglia-3.1.2.tar.gz 1213196 RMD160 1f78cf1019759e12c3c65901fd74ac65dfddf4e3 SHA1 be5db246eb755d8c450140d1c80afef4f1179fe1 SHA256 278f6fcf2299ceb8cacff999e54f96987e8d09064b1d43469108985bdeba6f12
 DIST ganglia-3.1.7.tar.gz 1278023 RMD160 918d678ad234d477fc98427d96485a8111c64f06 SHA1 e234d64814af1c9f55f1cd039a5840039d175f85 SHA256 bb1a4953d72e7dace76010a30d6d332e4ac0991d1371dbbcbcc7b048e0a7e4bf
 EBUILD ganglia-3.1.2.ebuild 5443 RMD160 7d197d8e757da5f59f407f308cb6c913436a6684 SHA1 9e79e653bbc172900a5ba82e002308fb4bedd5ca SHA256 25ddc5a87a7908cde9448db3f391877c8eec074ca552127d550fc5f071025d92
-EBUILD ganglia-3.1.7-r1.ebuild 2826 RMD160 7efe9fa39d41bbc832819e78562967e0a4b7e7de SHA1 03a530546168422e51c6c78d5390633e270db16e SHA256 c74e3fcf22eff043b5717e71d3421c67aec464c3d0e490b86c43f69e3f33da3e
-MISC ChangeLog 8171 RMD160 4a929bb15dc1458ca333fde64ea769b9f855f57e SHA1 298e7b8e70cea11889759a75f117708a0bd02c60 SHA256 9992c974e59ae12ab86b1449b93c4dcf93cfd8ba39af979c5a97185a45561d53
+EBUILD ganglia-3.1.7-r2.ebuild 2835 RMD160 f382bd0c2c68394b655d3146a2844acea3822476 SHA1 bf442ab922d8f435ce66c987a65e35fadff60dc2 SHA256 9ab32e125866812683bc7762595d218f2146b6066f445c6c3b175ed74d382b49
+MISC ChangeLog 8450 RMD160 cafc1245686ba14ddb22276b2cb63ef19812d858 SHA1 f7328d278f8060405b1a2a69f7befd830369acd9 SHA256 099ae3c2cccd85ec2915f3fce4def845eb4e823a1e5a1747f713a0d0652b64d3
 MISC metadata.xml 231 RMD160 37dd476ccaceaa37796cf29fd01af8fcfa2b4c61 SHA1 87cab1ccad4db7724c4292e4f32dd19accdcf2fa SHA256 b5305a12d2e3e9f9fdf645e98b0108c1bd8f5b5da32589a25bf7b0f0d74f1213
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkx0d74ACgkQ4MrvBE1wQ8nlmgCgsA5JtKipSwQIdGjpeLkES+0X
++7cAn098FE+iwe9Qm5d+VwcE7BY7PgEs
+=N64x
+-----END PGP SIGNATURE-----
diff --git a/sys-cluster/ganglia/files/gmetad.rc-2 b/sys-cluster/ganglia/files/gmetad.rc-2
new file mode 100755
index 000000000000..9cd10087b939
--- /dev/null
+++ b/sys-cluster/ganglia/files/gmetad.rc-2
@@ -0,0 +1,28 @@
+#!/sbin/runscript
+
+PIDFILE=/var/run/gmetad.pid
+
+depend() {
+	need net
+	after ntp-client ntpd
+}
+
+start() {
+	ebegin "Starting GANGLIA gmetad: "
+	start-stop-daemon \
+		--start --quiet \
+		--exec /usr/sbin/gmetad \
+		--pidfile ${PIDFILE} \
+		-- \
+		--pid-file=${PIDFILE}
+	eend $? "Failed to start gmetad"
+}
+
+stop() {
+	ebegin "Shutting down GANGLIA gmetad: "
+	start-stop-daemon \
+		--stop --quiet \
+		--pidfile ${PIDFILE} \
+		--exec /usr/sbin/gmetad
+	eend $? "Failed to stop gmetad"
+}
diff --git a/sys-cluster/ganglia/files/gmond.rc-2 b/sys-cluster/ganglia/files/gmond.rc-2
new file mode 100755
index 000000000000..c49f8fc512e4
--- /dev/null
+++ b/sys-cluster/ganglia/files/gmond.rc-2
@@ -0,0 +1,28 @@
+#!/sbin/runscript
+
+PIDFILE=/var/run/gmond.pid
+
+depend() {
+	need net
+	after ntp-client ntpd
+}
+
+start() {
+	ebegin "Starting GANGLIA gmond: "
+	start-stop-daemon \
+		--start --quiet \
+		--exec /usr/sbin/gmond \
+		--pidfile ${PIDFILE} \
+		-- \
+		--pid-file=${PIDFILE}
+	eend $? "Failed to start gmond"
+}
+
+stop() {
+	ebegin "Shutting down GANGLIA gmond: "
+	start-stop-daemon \
+		--stop --quiet \
+		--pidfile ${PIDFILE} \
+		--exec /usr/sbin/gmond
+	eend $? "Failed to stop gmond"
+}
diff --git a/sys-cluster/ganglia/ganglia-3.1.7-r1.ebuild b/sys-cluster/ganglia/ganglia-3.1.7-r2.ebuild
index d27b8ad4a482..aaf9ae622206 100644
--- a/sys-cluster/ganglia/ganglia-3.1.7-r1.ebuild
+++ b/sys-cluster/ganglia/ganglia-3.1.7-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.7-r1.ebuild,v 1.2 2010/07/03 15:34:23 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.7-r2.ebuild,v 1.1 2010/08/25 01:53:52 jsbronder Exp $
 
 EAPI="3"
 WEBAPP_OPTIONAL="yes"
@@ -61,7 +61,7 @@ src_install() {
 
 	emake DESTDIR="${D}" install || die "emake install failed"
 
-	newinitd "${FILESDIR}"/gmond.rc gmond
+	newinitd "${FILESDIR}"/gmond.rc-2 gmond
 	doman {mans/*.1,gmond/*.5} || die "Failed to install manpages"
 	dodoc AUTHORS ChangeLog INSTALL NEWS README || die
 
@@ -93,7 +93,7 @@ src_install() {
 		doins gmetad/gmetad.conf
 		doman mans/gmetad.1
 
-		newinitd "${FILESDIR}"/gmetad.rc gmetad
+		newinitd "${FILESDIR}"/gmetad.rc-2 gmetad
 		keepdir /var/lib/ganglia/rrds
 		fowners nobody:nobody /var/lib/ganglia/rrds
 	fi