Update init.d

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

7 files changed, 11 insertions, 6 deletions

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"