| 1 |
commit: 4b150b91ea4f76e331f2527599b19ba921651ac8 |
| 2 |
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jul 3 22:11:31 2011 +0000 |
| 4 |
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 3 22:11:31 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=4b150b91 |
| 7 |
|
| 8 |
Update init.d |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit with key F82F92E6) |
| 11 |
|
| 12 |
--- |
| 13 |
sys-cluster/slurm/files/slurm.confd | 5 +++++ |
| 14 |
sys-cluster/slurm/files/slurmctld.confd | 2 -- |
| 15 |
sys-cluster/slurm/files/slurmctld.initd | 2 ++ |
| 16 |
sys-cluster/slurm/files/slurmd.confd | 2 -- |
| 17 |
sys-cluster/slurm/files/slurmd.initd | 2 ++ |
| 18 |
sys-cluster/slurm/files/slurmdbd.confd | 2 -- |
| 19 |
sys-cluster/slurm/files/slurmdbd.initd | 2 ++ |
| 20 |
sys-cluster/slurm/slurm-2.2.7.ebuild | 10 +++++++--- |
| 21 |
8 files changed, 18 insertions(+), 9 deletions(-) |
| 22 |
|
| 23 |
diff --git a/sys-cluster/slurm/files/slurm.confd b/sys-cluster/slurm/files/slurm.confd |
| 24 |
new file mode 100644 |
| 25 |
index 0000000..13b6914 |
| 26 |
--- /dev/null |
| 27 |
+++ b/sys-cluster/slurm/files/slurm.confd |
| 28 |
@@ -0,0 +1,5 @@ |
| 29 |
+# /etc/conf.d/slurm: config file for /etc/init.d/slurm* |
| 30 |
+SLURMCTLD_OPTIONS="" |
| 31 |
+SLURMDBD_OPTIONS="" |
| 32 |
+SLURMD_OPTIONS="" |
| 33 |
+SLURM_USE_MUNGE="0" |
| 34 |
|
| 35 |
diff --git a/sys-cluster/slurm/files/slurmctld.confd b/sys-cluster/slurm/files/slurmctld.confd |
| 36 |
deleted file mode 100644 |
| 37 |
index 0f98eca..0000000 |
| 38 |
--- a/sys-cluster/slurm/files/slurmctld.confd |
| 39 |
+++ /dev/null |
| 40 |
@@ -1,2 +0,0 @@ |
| 41 |
-# /etc/conf.d/slurmctld: config file for /etc/init.d/slurmctld |
| 42 |
-SLURMCTLD_OPTIONS="" |
| 43 |
|
| 44 |
diff --git a/sys-cluster/slurm/files/slurmctld.initd b/sys-cluster/slurm/files/slurmctld.initd |
| 45 |
index 0d889d9..8b4e501 100644 |
| 46 |
--- a/sys-cluster/slurm/files/slurmctld.initd |
| 47 |
+++ b/sys-cluster/slurm/files/slurmctld.initd |
| 48 |
@@ -5,6 +5,8 @@ |
| 49 |
|
| 50 |
opts="reload" |
| 51 |
|
| 52 |
+[[ -f /etc/conf.d/slurm ]] && . /etc/conf.d/slurm |
| 53 |
+ |
| 54 |
depend() { |
| 55 |
local _need="net" |
| 56 |
[ ${SLURM_USE_MUNGE} -ne 0 ] && _need="${_need} munged" |
| 57 |
|
| 58 |
diff --git a/sys-cluster/slurm/files/slurmd.confd b/sys-cluster/slurm/files/slurmd.confd |
| 59 |
deleted file mode 100644 |
| 60 |
index 39ca725..0000000 |
| 61 |
--- a/sys-cluster/slurm/files/slurmd.confd |
| 62 |
+++ /dev/null |
| 63 |
@@ -1,2 +0,0 @@ |
| 64 |
-# /etc/conf.d/slurd: config file for /etc/init.d/slurd |
| 65 |
-SLURMD_OPTIONS="" |
| 66 |
|
| 67 |
diff --git a/sys-cluster/slurm/files/slurmd.initd b/sys-cluster/slurm/files/slurmd.initd |
| 68 |
index 7102863..07312d5 100644 |
| 69 |
--- a/sys-cluster/slurm/files/slurmd.initd |
| 70 |
+++ b/sys-cluster/slurm/files/slurmd.initd |
| 71 |
@@ -5,6 +5,8 @@ |
| 72 |
|
| 73 |
opts="reload" |
| 74 |
|
| 75 |
+[[ -f /etc/conf.d/slurm ]] && . /etc/conf.d/slurm |
| 76 |
+ |
| 77 |
depend() { |
| 78 |
local _need="net" |
| 79 |
[ ${SLURM_USE_MUNGE} -ne 0 ] && _need="${_need} munged" |
| 80 |
|
| 81 |
diff --git a/sys-cluster/slurm/files/slurmdbd.confd b/sys-cluster/slurm/files/slurmdbd.confd |
| 82 |
deleted file mode 100644 |
| 83 |
index 7b3ea99..0000000 |
| 84 |
--- a/sys-cluster/slurm/files/slurmdbd.confd |
| 85 |
+++ /dev/null |
| 86 |
@@ -1,2 +0,0 @@ |
| 87 |
-# /etc/conf.d/slurmdbd: config file for /etc/init.d/slurmdbd |
| 88 |
-SLURMDBD_OPTIONS="" |
| 89 |
|
| 90 |
diff --git a/sys-cluster/slurm/files/slurmdbd.initd b/sys-cluster/slurm/files/slurmdbd.initd |
| 91 |
index 61aa45a..a8b7bb9 100644 |
| 92 |
--- a/sys-cluster/slurm/files/slurmdbd.initd |
| 93 |
+++ b/sys-cluster/slurm/files/slurmdbd.initd |
| 94 |
@@ -5,6 +5,8 @@ |
| 95 |
|
| 96 |
opts="reload" |
| 97 |
|
| 98 |
+[[ -f /etc/conf.d/slurm ]] && . /etc/conf.d/slurm |
| 99 |
+ |
| 100 |
depend() { |
| 101 |
local _need="net" |
| 102 |
[ ${SLURM_USE_MUNGE} -ne 0 ] && _need="${_need} munged" |
| 103 |
|
| 104 |
diff --git a/sys-cluster/slurm/slurm-2.2.7.ebuild b/sys-cluster/slurm/slurm-2.2.7.ebuild |
| 105 |
index 0c6e9a5..ff9e1f2 100644 |
| 106 |
--- a/sys-cluster/slurm/slurm-2.2.7.ebuild |
| 107 |
+++ b/sys-cluster/slurm/slurm-2.2.7.ebuild |
| 108 |
@@ -85,9 +85,13 @@ src_install() { |
| 109 |
newinitd "${FILESDIR}/slurmctld.initd" slurmctld |
| 110 |
newinitd "${FILESDIR}/slurmdbd.initd" slurmdbd |
| 111 |
# install conf.d files |
| 112 |
- newconfd "${FILESDIR}/slurmd.confd" slurmd |
| 113 |
- newconfd "${FILESDIR}/slurmctld.confd" slurmctld |
| 114 |
- newconfd "${FILESDIR}/slurmdbd.confd" slurmdbd |
| 115 |
+ newconfd "${FILESDIR}/slurm.confd" slurmd |
| 116 |
+} |
| 117 |
+ |
| 118 |
+pkg_preinst() { |
| 119 |
+ if use munge; then |
| 120 |
+ sed -i 's,\(PBS_USE_MUNGE=\).*,\11,' "${D}"etc/conf.d/slurm || die |
| 121 |
+ fi |
| 122 |
} |
| 123 |
|
| 124 |
pkg_postinst() { |
Archives