Update init.d

(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key F82F92E6)

9 files changed, 36 insertions, 29 deletions

diff --git a/sys-cluster/slurm/Manifest b/sys-cluster/slurm/Manifest
index 627064c03..e7b274690 100644
--- a/sys-cluster/slurm/Manifest
+++ b/sys-cluster/slurm/Manifest
@@ -1,29 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX slurmctld.confd 84 RMD160 069c3311939ae5a3cfc0693c854e0586904d45b0 SHA1 06e5e2e1f41d80fda3bcbe300ed77862871ff5db SHA256 2becfbacc0b36c7a1928805bdda7e5870565aac53526c2144f11d4782792d598
-AUX slurmctld.initd 949 RMD160 d4448e2286d22f4d4c8438ccad3c69b364a8c0ce SHA1 3f8766bcca78de0e4cc6c1e1c2c4c2fc8604c852 SHA256 0d6c75bc0abcb157d7934c4adb2f6193d89bbd200b395ea03def72bfc124764d
-AUX slurmd.confd 73 RMD160 db41b84fd3948633a997f525481986c9d249eac1 SHA1 eb4d52eb1680b4a931c3883b54780806e578db28 SHA256 e5bc9e7eb15db9a5337692287bb5fe112c2dff831e4dcd2f5bd6d8f75f68a1d9
-AUX slurmd.initd 918 RMD160 b31401b18f763e3deb0e07a5a76deaefec926ae4 SHA1 511aa51ce648d215fbaef1f494a570e8aafe08bf SHA256 144fee886d61609df9926e8563636747cbf01d4d8aa77716ab5854e006cb388f
-AUX slurmdbd.confd 81 RMD160 c98dd4a8cd1ce03bc670664d0a5ee7a1374cc010 SHA1 d35b92ef92915b28a23c8898b12d6d05bf770111 SHA256 dcc4d4a152d5952bbe0101c6a75bffd9b2c486b14664d0890063874cced0489a
-AUX slurmdbd.initd 835 RMD160 a5069a057019a5461709f0f01fd9035c83321fbe SHA1 1b626db9ca7148858029ca0579e27a2ee15ef7b4 SHA256 de38bfc76565f7d8977980e3159beaa661853e1ddb8a1bf4cf980f412698c4f5
+AUX slurm.confd 135 RMD160 06c96613c42ec09d4a21ef3bf6334026e89d9838 SHA1 0f5ed287f8a6f7280ccf977dae8388811484bc34 SHA256 3cfc9c56046911d3e77214e35fbf6a5ffc153eb2205b2158986abbb111a49433
+AUX slurmctld.initd 1000 RMD160 9e1e1cc4b4c2349c1783fb519af7764c9cdf1403 SHA1 cfc3c76782ea4217f858055dbef8093df6c4028d SHA256 0c521fec4a434aa4d68df93db4a6678f1e4fa5d284a33735fd95cef12850ad09
+AUX slurmd.initd 969 RMD160 83cc81dbbb3d48c7c70ae5f2c96b8e0e210cd1dd SHA1 b432e52cd210301ec1da773ee78f63e2a5509374 SHA256 063d9082c76bc775ee156a570c963c617ead0687713ca3f75f9481a21fcf20aa
+AUX slurmdbd.initd 886 RMD160 64c73e874544ef6489a0982675231bb7d0c93a47 SHA1 1403de627b8b6799672001a3cabe05bbbdc3f4f7 SHA256 c211b9245290bbb3fc673efec08333c8d5a19a579e60afc1684701de4121beff
 DIST slurm-2.2.7.tar.bz2 4454740 RMD160 37ee3ef3382e3ca00cff99901020825bbf0c0b03 SHA1 b5e62504f31007f593d6ce6d90415579273a7b0f SHA256 8dfd8ec1b447caa1c8d83817a90414e19bc5b8cc9caf2c7ec4b6d2cb6bcd0a7e
-EBUILD slurm-2.2.7.ebuild 2777 RMD160 fbf18ff4122a96daaf1edca82a66d6d34a9b87f0 SHA1 6db73918011c8b45c785be9a4905f8252d147028 SHA256 855b7beb25135abab9f6c169f8aff099dffeec296d4cd849ef39360ed7308139
+EBUILD slurm-2.2.7.ebuild 2790 RMD160 cb014095fb2dd62369279b292538a2584c002a24 SHA1 0e4214a0739a6572e3f1a37716047a74087abf31 SHA256 e4b41778721904abbd9768a3f34ca3c2559960565f2bedc2fadcf6bbd710dd5a
 MISC metadata.xml 379 RMD160 4a199f0d95589c864c73e4bad327196ccf769747 SHA1 788916a6f69dab573382eb0cf03f24ad25f01bd4 SHA256 4e4814acbce03b066d86f95768afeab676e8f9662d64c9bf878832f34f93b5ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJOEOWKAAoJEOf+E+/4L5LmRb4P/3i58ESkOywIE89D/KCm/tMi
-CchYsbCy/XMQmGfEHZA0qlquNlSLponzo6WZoolKGtYU8QQhb8xHLwjlOYKbbPSQ
-V0R1zeS0OJrc0O/v1k7Houzg6na4sdPxSk39526l/mKTmxFODaejXUkFFeNF1ENE
-HDA7dxVBYz07VcerMJ4F7VayOvuYhsCyB55wggoEzuuqlp5hOzCaNJJTLS3pk2DE
-eA5h6UPpQ5W2w14zQ46QmBMihnI6UiiPifL2/EeM8B67a+eX2t1AVzqkWaun+LvB
-R0wfmltTmNjXJ3b6Blb71meJs5mi3gZ9EB7XuL9U7yxgs9CCXMKabdTxh7YMa3oP
-TBBj21KR7CXs9knL+4XfF12BT+ZL7P/LxTi05AwTgv9tvhjC+AJMO1arPcIlGhAD
-vxAn+zj8ES12OFhJ84SwNqqDDsMcXgHRF3WcVmqygFEpm6oH2X2kBX8gNIzKdf5k
-48/Tvbx8WXEae7S8Gbw7oSEMxrw7l2S83g1xROCQY4ke2VdEQM8KRM9P5A9k5bJj
-VZgRyVnC7F4Cioh9mi96ZKEsx3rW7FbmxAGmEAfNbJc96lKMoCeiWIGP6VgkIYU0
-AGsS8/poXW6LVLFTFbXsuOEnAnb2vs50xKCYGuNb0OrhM9MEgeXwMuNJzzPKUVDk
-nwNwORCq6NG9r4D3cTal
-=ndxt
+iQIcBAEBCAAGBQJOEOkTAAoJEOf+E+/4L5Lmn+YP/R0YckD7lmT2/gK7QDy0InOn
+F9LxQIJXBE7O3DbyNfwW04qgJ6gnw7x5h+stJFa4kxVacgUqdjaBgWU3YLtYnaP+
+kPyCIYJ5LmW0ssWhNqAnQE8EwnQH4UzLyuVYeGnlywknEFGbjQMkQQc0nUtCgdeX
+pRZXuR2XQDLZDSMcZev6K7sz3Iw/G4iaDzV1GnSv1FtuO1S9pLih2O8GN9Cows/L
+9yLbsQZEc9O2Jx9pEQqy0OzatQlKIecZI7kCSM643rqYWRusQlRgmmrwwRQFwiRv
+ePpyjgaJJBVn76m0EbeiajGkGU6aOfnXeYBgU8w3GS/1Hde8lNNi+vkbXw/brSD/
+9HmlNgyXiXlS1TnajGX4OqsB9V3ccbfeSNUkcL7m2RNGBCzFXimVMYXfF20x2ZkI
+e4u2jkODNB1wTauJ1xRZYyKYDqtxP1qNVXKTZtBOfWrSMawesmCY5RI8QTgnikwh
+6c1mJ46tRQDZN1sQeVk0ewb+Dw4D0NQg5NVvZMxYPmiJ4TSWbWZ+4tyHhCA8qVlF
++noxMKSnrcGK6yy2NjNcYv6mzLFu8yzA0OmwBg2K9//KsLk0mB6szCaLahyeO6Sc
+6Z71fjGbYxL1MwHfU7outW6KC8xmTI1T78G9B2TWjvzWrREEDX5/IC5sOqyEUK7+
+NeC/6rQSW9lBcV2D6iGt
+=Dm4l
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/slurm/files/slurm.confd b/sys-cluster/slurm/files/slurm.confd
new file mode 100644
index 000000000..13b69146e
--- /dev/null
+++ b/sys-cluster/slurm/files/slurm.confd
@@ -0,0 +1,5 @@
+# /etc/conf.d/slurm: config file for /etc/init.d/slurm*
+SLURMCTLD_OPTIONS=""
+SLURMDBD_OPTIONS=""
+SLURMD_OPTIONS=""
+SLURM_USE_MUNGE="0"
diff --git a/sys-cluster/slurm/files/slurmctld.confd b/sys-cluster/slurm/files/slurmctld.confd
deleted file mode 100644
index 0f98eca6a..000000000
--- a/sys-cluster/slurm/files/slurmctld.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# /etc/conf.d/slurmctld: config file for /etc/init.d/slurmctld
-SLURMCTLD_OPTIONS=""
diff --git a/sys-cluster/slurm/files/slurmctld.initd b/sys-cluster/slurm/files/slurmctld.initd
index 0d889d92a..8b4e5010f 100644
--- a/sys-cluster/slurm/files/slurmctld.initd
+++ b/sys-cluster/slurm/files/slurmctld.initd
@@ -5,6 +5,8 @@
 
 opts="reload"
 
+[[ -f /etc/conf.d/slurm ]] && . /etc/conf.d/slurm
+
 depend() {
 	local _need="net"
 	[ ${SLURM_USE_MUNGE} -ne 0 ] && _need="${_need} munged"
diff --git a/sys-cluster/slurm/files/slurmd.confd b/sys-cluster/slurm/files/slurmd.confd
deleted file mode 100644
index 39ca7255f..000000000
--- a/sys-cluster/slurm/files/slurmd.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# /etc/conf.d/slurd: config file for /etc/init.d/slurd
-SLURMD_OPTIONS=""
diff --git a/sys-cluster/slurm/files/slurmd.initd b/sys-cluster/slurm/files/slurmd.initd
index 71028630d..07312d50d 100644
--- a/sys-cluster/slurm/files/slurmd.initd
+++ b/sys-cluster/slurm/files/slurmd.initd
@@ -5,6 +5,8 @@
 
 opts="reload"
 
+[[ -f /etc/conf.d/slurm ]] && . /etc/conf.d/slurm
+
 depend() {
 	local _need="net"
 	[ ${SLURM_USE_MUNGE} -ne 0 ] && _need="${_need} munged"
diff --git a/sys-cluster/slurm/files/slurmdbd.confd b/sys-cluster/slurm/files/slurmdbd.confd
deleted file mode 100644
index 7b3ea9923..000000000
--- a/sys-cluster/slurm/files/slurmdbd.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# /etc/conf.d/slurmdbd: config file for /etc/init.d/slurmdbd
-SLURMDBD_OPTIONS=""
diff --git a/sys-cluster/slurm/files/slurmdbd.initd b/sys-cluster/slurm/files/slurmdbd.initd
index 61aa45a18..a8b7bb979 100644
--- a/sys-cluster/slurm/files/slurmdbd.initd
+++ b/sys-cluster/slurm/files/slurmdbd.initd
@@ -5,6 +5,8 @@
 
 opts="reload"
 
+[[ -f /etc/conf.d/slurm ]] && . /etc/conf.d/slurm
+
 depend() {
 	local _need="net"
 	[ ${SLURM_USE_MUNGE} -ne 0 ] && _need="${_need} munged"
diff --git a/sys-cluster/slurm/slurm-2.2.7.ebuild b/sys-cluster/slurm/slurm-2.2.7.ebuild
index 0c6e9a5dc..ff9e1f2d2 100644
--- a/sys-cluster/slurm/slurm-2.2.7.ebuild
+++ b/sys-cluster/slurm/slurm-2.2.7.ebuild
@@ -85,9 +85,13 @@ src_install() {
 	newinitd "${FILESDIR}/slurmctld.initd" slurmctld
 	newinitd "${FILESDIR}/slurmdbd.initd" slurmdbd
 	# install conf.d files
-	newconfd "${FILESDIR}/slurmd.confd" slurmd
-	newconfd "${FILESDIR}/slurmctld.confd" slurmctld
-	newconfd "${FILESDIR}/slurmdbd.confd" slurmdbd
+	newconfd "${FILESDIR}/slurm.confd" slurmd
+}
+
+pkg_preinst() {
+	if use munge; then
+		sed -i 's,\(PBS_USE_MUNGE=\).*,\11,' "${D}"etc/conf.d/slurm || die
+	fi
 }
 
 pkg_postinst() {