Gentoo Archives: gentoo-commits

From: Alexey Shvetsov <alexxy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/slurm/, sys-cluster/slurm/files/
Date: Sun, 03 Jul 2011 22:56:53
Message-Id: e78f6a691f2455bd8d71840f59daa5622e3eef48.alexxy@gentoo
1 commit: e78f6a691f2455bd8d71840f59daa5622e3eef48
2 Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 3 22:56:19 2011 +0000
4 Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 3 22:56:19 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=e78f6a69
7
8 Fix permissions
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/slurmctld.initd | 4 ++--
14 sys-cluster/slurm/files/slurmd.initd | 4 ++--
15 sys-cluster/slurm/files/slurmdbd.initd | 4 ++--
16 sys-cluster/slurm/slurm-2.2.7.ebuild | 9 +++++++++
17 4 files changed, 15 insertions(+), 6 deletions(-)
18
19 diff --git a/sys-cluster/slurm/files/slurmctld.initd b/sys-cluster/slurm/files/slurmctld.initd
20 index 2e4c0fc..8cd7fa5 100644
21 --- a/sys-cluster/slurm/files/slurmctld.initd
22 +++ b/sys-cluster/slurm/files/slurmctld.initd
23 @@ -26,7 +26,7 @@ checkconfig() {
24 start() {
25 ebegin "Starting slurm control daemon"
26 start-stop-daemon --start --quiet --background \
27 - --pidfile /var/run/slurmctld.pid \
28 + --pidfile /var/run/slurm/slurmctld.pid \
29 --user slurm \
30 --group slurm \
31 --exec /usr/sbin/slurmctld -- ${SLURMCTLD_OPTS}
32 @@ -35,7 +35,7 @@ start() {
33
34 stop() {
35 ebegin "Stopping slurm control daemon"
36 - start-stop-daemon --stop --pidfile /var/run/slurmctld.pid
37 + start-stop-daemon --stop --pidfile /var/run/slurm/slurmctld.pid
38 eend $?
39 }
40
41
42 diff --git a/sys-cluster/slurm/files/slurmd.initd b/sys-cluster/slurm/files/slurmd.initd
43 index 6964f93..7a0449d 100644
44 --- a/sys-cluster/slurm/files/slurmd.initd
45 +++ b/sys-cluster/slurm/files/slurmd.initd
46 @@ -26,7 +26,7 @@ checkconfig() {
47 start() {
48 ebegin "Starting slurm daemon"
49 start-stop-daemon --start --quiet --background \
50 - --pidfile /var/run/slurmd.pid \
51 + --pidfile /var/run/slurm/slurmd.pid \
52 --user slurm \
53 --group slurm \
54 --exec /usr/sbin/slurmd -- ${SLURMD_OPTS}
55 @@ -35,7 +35,7 @@ start() {
56
57 stop() {
58 ebegin "Stopping slurm daemon"
59 - start-stop-daemon --stop --pidfile /var/run/slurmd.pid
60 + start-stop-daemon --stop --pidfile /var/run/slurm/slurmd.pid
61 eend $?
62 }
63
64
65 diff --git a/sys-cluster/slurm/files/slurmdbd.initd b/sys-cluster/slurm/files/slurmdbd.initd
66 index a45a785..17cfd2c 100644
67 --- a/sys-cluster/slurm/files/slurmdbd.initd
68 +++ b/sys-cluster/slurm/files/slurmdbd.initd
69 @@ -24,7 +24,7 @@ checkconfig() {
70 start() {
71 ebegin "Starting slurmdb daemon"
72 start-stop-daemon --start --quiet --background \
73 - --pidfile /var/run/slurmddb.pid \
74 + --pidfile /var/run/slurm/slurmddb.pid \
75 --user slurm \
76 --group slurm \
77 --exec /usr/sbin/slurmddb -- ${SLURMD_OPTS}
78 @@ -33,7 +33,7 @@ start() {
79
80 stop() {
81 ebegin "Stopping slurmdb daemon"
82 - start-stop-daemon --stop --pidfile /var/run/slurmdbd.pid
83 + start-stop-daemon --stop --pidfile /var/run/slurm/slurmdbd.pid
84 eend $?
85 }
86
87
88 diff --git a/sys-cluster/slurm/slurm-2.2.7.ebuild b/sys-cluster/slurm/slurm-2.2.7.ebuild
89 index 00aa0b4..6478bfc 100644
90 --- a/sys-cluster/slurm/slurm-2.2.7.ebuild
91 +++ b/sys-cluster/slurm/slurm-2.2.7.ebuild
92 @@ -72,6 +72,7 @@ src_install() {
93 keepdir /etc/slurm
94 keepdir /var/log/slurm
95 keepdir /var/spool/slurm
96 + keepdir /var/run/slurm
97 insinto /etc/slurm
98 doins etc/cgroup.conf.example
99 doins etc/federation.conf.example
100 @@ -95,6 +96,14 @@ pkg_preinst() {
101 }
102
103 pkg_postinst() {
104 + einfo "Fixing permissions in /var/spool/${PN}"
105 + chown -R ${PN}:${PN} /var/spool/${PN}
106 + einfo "Fixing permissions in /var/run/${PN}"
107 + chown -R ${PN}:${PN} /var/run/${PN}
108 + einfo "Fixing permissions in /var/log/${PN}"
109 + chown -R ${PN}:${PN} /var/log/${PN}
110 + echo
111 +
112 elog "Please visit the file '/usr/share/doc/${P}/html/configurator.html"
113 elog "through a (javascript enabled) browser to create a configureation file."
114 elog "Copy that file to /etc/slurm.conf on all nodes (including the headnode) of your cluster."