From a56a7e088d5c9c299c6ef28165a9de55635a3aaf Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Tue, 24 Sep 2013 16:28:53 -0500
Subject: [PATCH] Touch up configure_test_slurm.py for non-my-laptop setups.

---
 scripts/configure_test_slurm.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/configure_test_slurm.py b/scripts/configure_test_slurm.py
index 99bc9e41..6685508c 100755
--- a/scripts/configure_test_slurm.py
+++ b/scripts/configure_test_slurm.py
@@ -1,6 +1,7 @@
 from socket import gethostname
 from string import Template
 from subprocess import call
+from getpass import getuser
 
 SLURM_CONFIG_TEMPLATE = '''
 # slurm.conf file generated by configurator.html.
@@ -33,7 +34,7 @@ SlurmctldPort=6817
 SlurmdPidFile=/var/run/slurmd.pid
 SlurmdPort=6818
 SlurmdSpoolDir=/tmp/slurmd
-SlurmUser=john
+SlurmUser=$user
 #SlurmdUser=root
 #SrunEpilog=
 #SrunProlog=
@@ -80,7 +81,7 @@ PartitionName=debug Nodes=$hostname Default=YES MaxTime=INFINITE State=UP
 
 
 def main():
-    template_params = {"hostname": gethostname()}
+    template_params = {"hostname": gethostname(), "user": getuser()}
     config_contents = Template(SLURM_CONFIG_TEMPLATE).substitute(template_params)
     open("/etc/slurm-llnl/slurm.conf", "w").write(config_contents)
     call("slurmctld")
-- 
GitLab