[sys-cluster/slurm] Update init.d reload stuff

Package-Manager: portage-2.2.0_alpha43/cvs/Linux x86_64

5 files changed, 28 insertions, 24 deletions

diff --git a/sys-cluster/slurm/ChangeLog b/sys-cluster/slurm/ChangeLog
index 630d410fe52c..2461abad1e8c 100644
--- a/sys-cluster/slurm/ChangeLog
+++ b/sys-cluster/slurm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/slurm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/ChangeLog,v 1.2 2011/07/04 07:51:12 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/ChangeLog,v 1.3 2011/07/04 10:15:30 alexxy Exp $
+
+  04 Jul 2011; Alexey Shvetsov <alexxy@gentoo.org> files/slurmctld.initd,
+  files/slurmd.initd, files/slurmdbd.initd:
+  Update init.d reload stuff
 
   04 Jul 2011; Alexey Shvetsov <alexxy@gentoo.org> slurm-2.2.7.ebuild,
   files/slurmd.initd:
diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index d45ac1a4b997..707e98662de7 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -2,27 +2,27 @@
 Hash: SHA256
 
 AUX slurm.confd 135 RMD160 06c96613c42ec09d4a21ef3bf6334026e89d9838 SHA1 0f5ed287f8a6f7280ccf977dae8388811484bc34 SHA256 3cfc9c56046911d3e77214e35fbf6a5ffc153eb2205b2158986abbb111a49433
-AUX slurmctld.initd 1115 RMD160 2ac8fbf379c4ea5cf6b49d238b029de7ebe4d337 SHA1 3f8346cf3c0bd612e96f82dde75089442325344f SHA256 8753d99b93bde96580b411a33e40b7553908ac6b4499c5ddb748894df6388368
-AUX slurmd.initd 1079 RMD160 26b855dd8bd0f41b12c1eabc7bcfe4462353d7a6 SHA1 dcdca92222dc108c3f970c0d598325f753002ed4 SHA256 d5f4b134a1bbfcbb80547191b30366bd25b91c1428865d4b355218f8fcbcef88
-AUX slurmdbd.initd 1000 RMD160 db8015c3faba28e1e3142b87ec8704e596957c93 SHA1 24374dae5d4091a55e5f3b28783dc28e6c080061 SHA256 17dc0b649b68dc89f0a94be04611eb40c5be1572124252bd48cecadb6ef6316b
+AUX slurmctld.initd 1161 RMD160 5a5c8c8e2cf467467e7ba1858109789a750cc423 SHA1 c05dd34a84397d9293e1cee38b23271ddd6443d7 SHA256 e7620a54c47d94c02755be549d11365714fffe7f20a36f16c3ffb7f1d12becc5
+AUX slurmd.initd 1125 RMD160 1b5f8a9a719ebfa05125c597cb5d3bf149e9a6e0 SHA1 08b8265c0a4727b0bba04c1eae37fb6f4a47f1a7 SHA256 6dbd921451209bdd62c3354e5e5c0c000de3af7cf4e4f809bac7fda59bff663b
+AUX slurmdbd.initd 1046 RMD160 dd897cbdc0a5e64a24ad43b76c2b85b8a7515824 SHA1 b7ba92782a5010e6bca4b5b4903e9f57f16ca921 SHA256 ddf8c11886a1bce77b7ce8e73f6b91ceb5a994fbb3665e9e3f51468eae02fe48
 DIST slurm-2.2.7.tar.bz2 4454740 RMD160 37ee3ef3382e3ca00cff99901020825bbf0c0b03 SHA1 b5e62504f31007f593d6ce6d90415579273a7b0f SHA256 8dfd8ec1b447caa1c8d83817a90414e19bc5b8cc9caf2c7ec4b6d2cb6bcd0a7e
 EBUILD slurm-2.2.7.ebuild 3596 RMD160 c28c4373dd12a32edb81f328b29f61c3abcab348 SHA1 50dfd61a5c7a295cde36af55ba75822878096885 SHA256 308584d646274914ee00708bf1c3d9574783b9e71421c9ce8e017d46f02d3af6
-MISC ChangeLog 557 RMD160 79eb78ae425382a07d2209c877203e69808fb816 SHA1 4accd69b0bc18873a63e10119de3c47223f753d7 SHA256 550d06dd00cbb0aab3edde26f9ac2d90e7d416f7d1caefbe6f368132999fe6c7
+MISC ChangeLog 705 RMD160 4bf264972a224d2b9df9e564b1082d8741256600 SHA1 bbf57b636e7abb26c7aabf4cbb6f5754cbad72d9 SHA256 c14b0aee3d30a683be8638c654fe73da0e9a7f101bb0fbd3d901091c8fd88ded
 MISC metadata.xml 357 RMD160 f291b61aa0c7835c8786978a00b00f52001fbda3 SHA1 13a85c8bde78123a5ea891e702668b8cd918755d SHA256 2b2b9c330d1664771240f5cfe445493a3f01e977c103d023e675a5372b67fad6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOEXDuAAoJEOf+E+/4L5LmzHkP/iBsFRLyilquEUlYOZNmJ/NB
-7YRmVzEddiiIIUqhNWUTaAWKEYNwkwaHSL4IOmskuOzptsF5L9MdVPFZ2g3gx3Q5
-XS8WcEwgogvd2lcVK92mqIhgeBfbDenUhkrHuHXYzMAYAzPsfmhLY866xB7uFSQ6
-8Ukeo/WT5aRNV1VV5rySkZin1X/je2Iynhw2UkJgdRBYatRn2CzueWHX8XU73PDO
-+uy0EPgo9g83oepb4ny+SuNm59GvwdIBoZQI6TkB98jaTh+ik9Oqg+HNUkf28ZnN
-LP3I+vZxHlp/r7uJk/JaMm7VDIK5kP/OXLQBdbXDGEzArLGswydgnrXz8ZEWqCKb
-03+zvvc8inb1L+S8Dw1mrbjeKFQCQfsf/p9E1qvqB+pL+0s0XfxtNH7TkWS2LZPN
-2udHaDIsSOJ7z2FUQkYKW5cU1YXiQq1n2BvZfYWVm09K6GTxW+A3T/mRe6uMHEqI
-5fYnV22AIqkLVENq9aoW3w2k1sZSQbX4x1rVgqXrcAMJ6hDsQ677VW86JHO2MbPT
-UCstOa/kfRJCTpW9z3+9S3619sDTCqiW6LUhVa5uWNqAMGk5trJ7E80AoxoCrIkt
-9xWCT/qLPoBGp2Qr1BHRep8nen+1163gG07HfRxwetTWMrgakmn1SmiRjmy2ghTK
-Y7s3hZCNR1DEIK4V6G98
-=lIED
+iQIcBAEBCAAGBQJOEZK9AAoJEOf+E+/4L5LmqpAP/ifp0jovouFq29hBgvZ2hw3f
+xzosgCFe/wXNDMtuzEaw3Rdh6TVOssfetGrvqTTnNWzTqTD7g+N/yRZY16swSwM6
+xTRt2bEqc6M18c3kn3DQdE858ku0KRvDdNgDACHKOnFWIYnA+5a7xy5hsHr97u9U
+VDqx8dTKi2lhdKTU82UeceL5biYkmstiIBFRYm9YwSeL0lOtHZQMLY257bTRIOK9
+Y+LWfdZuJcRYuYtlHRugseJ5fN4JTyPLsvctgVE/JyVraYFAYzfhNPntvXKfmWUj
+G3Fe0fGO/pkXWZNU93GLBWuFoFYjSwXbNEWSZS+jzWogeC5NSZ2ySgO5CCayEOsN
+uugp7ggcDrvtGNeK0qOPMyiGDs6dLbuk2hZ14EH2cS3C51MJmWuGj/1lb5Jyc5Y8
+VTdhM6aNSUC3xhaidAs1Qnr6sqPGf7yTmE+34204rdxrsdcO5NSco3kmkoZ54cou
+r+Wp0R6NBqXuoRv7zlc80WoaeU8qkfpXzhF0/Ail1t9aQP7sHkjmQuZ+1ye5Nt+N
+//54UpyzOYLhnUeeKFJfQ4OIaa/Gna+yee9bwr4BGEoEudP29cA8V2rUjJYxNHBc
+uAR+mbgkJ7GT/EmjQIjucZweS6YGeGD0IfRQguZT+4oIdxwJZ6g9beF9R5blIfVR
+a3Q+XvJvUl5Eau/V5vWA
+=ozMG
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/slurm/files/slurmctld.initd b/sys-cluster/slurm/files/slurmctld.initd
index 0ebba3ea8616..133aaa62923d 100644
--- a/sys-cluster/slurm/files/slurmctld.initd
+++ b/sys-cluster/slurm/files/slurmctld.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/files/slurmctld.initd,v 1.1 2011/07/03 23:23:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/files/slurmctld.initd,v 1.2 2011/07/04 10:15:30 alexxy Exp $
 
 opts="reload"
 
@@ -41,6 +41,6 @@ stop() {
 
 reload() {
 	ebegin "Reloading slurm daemon configuration"
-	killproc slurmctld -HUP
+	start-stop-daemon --signal HUP --pidfile /var/run/slurm/slurmctld.pid
 	eend $?
 }
diff --git a/sys-cluster/slurm/files/slurmd.initd b/sys-cluster/slurm/files/slurmd.initd
index 03d7de0d76cb..a1a4be242759 100644
--- a/sys-cluster/slurm/files/slurmd.initd
+++ b/sys-cluster/slurm/files/slurmd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/files/slurmd.initd,v 1.2 2011/07/04 07:51:12 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/files/slurmd.initd,v 1.3 2011/07/04 10:15:30 alexxy Exp $
 
 opts="reload"
 
@@ -41,6 +41,6 @@ stop() {
 
 reload() {
 	ebegin "Reloading slurm daemon configuration"
-	killproc slurmd -HUP
+	start-stop-daemon --signal HUP --pidfile /var/run/slurm/slurmd.pid
 	eend $?
 }
diff --git a/sys-cluster/slurm/files/slurmdbd.initd b/sys-cluster/slurm/files/slurmdbd.initd
index 6d3a97a54385..c8512c516293 100644
--- a/sys-cluster/slurm/files/slurmdbd.initd
+++ b/sys-cluster/slurm/files/slurmdbd.initd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/files/slurmdbd.initd,v 1.1 2011/07/03 23:23:21 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/slurm/files/slurmdbd.initd,v 1.2 2011/07/04 10:15:30 alexxy Exp $
 
 opts="reload"
 
@@ -39,6 +39,6 @@ stop() {
 
 reload() {
 	ebegin "Reloading slurmdb daemon configuration"
-	killproc slurmdbd -HUP
+	start-stop-daemon --signal HUP --pidfile /var/run/slurm/slurmdbd.pid
 	eend $?
 }