summaryrefslogtreecommitdiff
path: root/sysutils/slurm-wlm/files
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2016-03-17 16:39:05 +0000
committerMark Felder <feld@FreeBSD.org>2016-03-17 16:39:05 +0000
commitd9d14f98168358b7d9972653e1f207fe960da2b3 (patch)
tree67469709fae57a0a0b566d56f5bdbdfd27cd6c6c /sysutils/slurm-wlm/files
parentsecurity/openxpki-i18n: Update to 1.5.0 (diff)
sysutils/slurm-wlm: Update to 15.08.8
Changelog: https://github.com/SchedMD/slurm/blob/921064fefd9cb3ea3e997e0f79a3c016c8d30c7c/RELEASE_NOTES PR: 207967
Notes
Notes: svn path=/head/; revision=411292
Diffstat (limited to 'sysutils/slurm-wlm/files')
-rw-r--r--sysutils/slurm-wlm/files/patch-src-plugins-acct_gather_filesystem-lustre-acct_gather_filesystem_lustre.c11
-rw-r--r--sysutils/slurm-wlm/files/slurm.conf.example13
2 files changed, 11 insertions, 13 deletions
diff --git a/sysutils/slurm-wlm/files/patch-src-plugins-acct_gather_filesystem-lustre-acct_gather_filesystem_lustre.c b/sysutils/slurm-wlm/files/patch-src-plugins-acct_gather_filesystem-lustre-acct_gather_filesystem_lustre.c
deleted file mode 100644
index 2e26042037f0..000000000000
--- a/sysutils/slurm-wlm/files/patch-src-plugins-acct_gather_filesystem-lustre-acct_gather_filesystem_lustre.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c.orig 2015-04-23 22:50:47 UTC
-+++ src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c
-@@ -57,6 +57,8 @@
-
- #include "src/slurmd/slurmd/slurmd.h"
-
-+#include <limits.h>
-+
-
- /***************************************************************/
-
diff --git a/sysutils/slurm-wlm/files/slurm.conf.example b/sysutils/slurm-wlm/files/slurm.conf.example
index fe11d93b54ef..b559490f2a46 100644
--- a/sysutils/slurm-wlm/files/slurm.conf.example
+++ b/sysutils/slurm-wlm/files/slurm.conf.example
@@ -6,6 +6,15 @@
# See the slurm.conf man page for more information.
#
+# NOTE: The parent directories for Slurm's log files, process ID
+# files, state save directories, etc. are not created by Slurm. They
+# must be created and made writable by the slurm user as needed prior to
+# starting Slurm daemons.
+#
+# If you keep the configuration directives below, you should create
+# the directories /var/log/slurm/, /var/run/slurm/, and
+# /var/spool/slurmd and make them owned and writable by the slurm user.
+
AuthType=auth/munge
#BackupAddr=
#BackupController=
@@ -75,9 +84,9 @@ SelectType=select/linear
#JobCompLoc=
JobCompType=jobcomp/none
SlurmctldDebug=3
-SlurmctldLogFile=/var/log/slurmctld.log
+SlurmctldLogFile=/var/log/slurm/slurmctld.log
SlurmdDebug=3
-SlurmdLogFile=/var/log/slurmd.log
+SlurmdLogFile=/var/log/slurm/slurmd.log
# ACCOUNTING
#AccountingStorageHost=