From f03b4165fd33b2f8844a4bcda7f650a7023986f1 Mon Sep 17 00:00:00 2001
From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Thu, 25 Feb 2016 11:15:47 -0500
Subject: [PATCH 1/1] Tweak slurm configuration to run as non-root user.

---
 arvbox/lib/arvbox/docker/service/slurmctld/run | 4 +++-
 arvbox/lib/arvbox/docker/service/slurmd/run    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arvbox/lib/arvbox/docker/service/slurmctld/run b/arvbox/lib/arvbox/docker/service/slurmctld/run
index 7b3c6e1f2e..bd75bd07be 100755
--- a/arvbox/lib/arvbox/docker/service/slurmctld/run
+++ b/arvbox/lib/arvbox/docker/service/slurmctld/run
@@ -9,9 +9,11 @@ cat > /etc/slurm-llnl/slurm.conf  <<EOF
 ControlMachine=$HOSTNAME
 ControlAddr=$HOSTNAME
 AuthType=auth/munge
-DefaultStorageLoc=/var/log/slurm
+DefaultStorageLoc=/var/log/slurm-llnl
 SelectType=select/cons_res
+SelectTypeParameters=CR_CPU_Memory
 SlurmUser=arvbox
+SlurmdUser=arvbox
 SlurmctldPort=7002
 SlurmctldTimeout=300
 SlurmdPort=7003
diff --git a/arvbox/lib/arvbox/docker/service/slurmd/run b/arvbox/lib/arvbox/docker/service/slurmd/run
index 697f7a2907..865a7e6bbc 100755
--- a/arvbox/lib/arvbox/docker/service/slurmd/run
+++ b/arvbox/lib/arvbox/docker/service/slurmd/run
@@ -3,4 +3,4 @@
 exec 2>&1
 set -eux -o pipefail
 
-exec /usr/sbin/slurmd -v -D
+exec /usr/local/lib/arvbox/runsu.sh /usr/sbin/slurmd -v -D
-- 
2.30.2