upgpkg: slurm-llnl 16.05.6-2

Move pid files in systemd services to /run instead of using a subfolder.
Skip the creation of /var/log/slurm in systemd-tmpfiles since the log
location is /var/log/slurm-llnl and install the tmpfile to /usr/lib
instead of /etc/ .

upgpkg: slurm-llnl-dev 17.02.0_0pre3-2
upgpkg: slurm-llnl 16.05.6-1

6 files changed, 15 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8e5d634584d3..6872f1e04cc6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = slurm-llnl-git
 	pkgdesc = Simple Linux Utility for Resource Management (development version)
-	pkgver = 17.02.0.0pre2.r292.g3fa5a23
+	pkgver = 17.02.0.0pre2.r298.g3a3ae2a
 	pkgrel = 1
 	url = http://www.schedmd.com
 	install = slurm-llnl-git.install
@@ -25,7 +25,7 @@ pkgbase = slurm-llnl-git
 	optdepends = numactl: NUMA support in the task/affinity plugin
 	optdepends = ncurses: adds the smap command
 	optdepends = gtk2: enables the sview command, a simple graphical frontend
-	provides = slurm-llnl=17.02.0.0pre2.r292.g3fa5a23
+	provides = slurm-llnl=17.02.0.0pre2.r298.g3a3ae2a
 	conflicts = slurm-llnl
 	conflicts = slurm-llnl-dev
 	backup = etc/default/slurm-llnl
@@ -35,11 +35,11 @@ pkgbase = slurm-llnl-git
 	source = slurmd.service
 	source = slurmdbd.service
 	source = slurm-llnl-git::git+https://github.com/SchedMD/slurm.git
-	md5sums = 51e4ae2c51edf7c145d1b87bec4c344e
+	md5sums = 0594bc219f4fd8a0e8663330619829b5
 	md5sums = cae664b8ef44d01783dade9088e25b53
-	md5sums = 06b572524c0e419d91c81d84c169358b
-	md5sums = 5cfc5d7bf548dd0dd3b6ac3708daccb7
-	md5sums = da7a52451ce31c9269211b309f9ebe1c
+	md5sums = 5545ddfc50e0f517ee59fff054a3f866
+	md5sums = 54181476ea043812e658ddf08d997734
+	md5sums = f5b4e5e24ad8bdffb12a3bdb6b08d2de
 	md5sums = SKIP
 
 pkgname = slurm-llnl-git
diff --git a/PKGBUILD b/PKGBUILD
index ac7e1d6757f6..73d12d45e1a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Submitter: Fredrik Tegenfeldt <fredrik.tegenfeldt@unige.ch>
 
 pkgname=slurm-llnl-git
-pkgver=17.02.0.0pre2.r292.g3fa5a23
+pkgver=17.02.0.0pre2.r298.g3a3ae2a
 pkgrel=1
 pkgdesc="Simple Linux Utility for Resource Management (development version)"
 arch=('i686' 'x86_64')
@@ -36,11 +36,11 @@ source=("slurm-tmpfiles.conf"
 	"slurmd.service"
 	"slurmdbd.service"
 	"${pkgname}"::"git+https://github.com/SchedMD/slurm.git")
-md5sums=('51e4ae2c51edf7c145d1b87bec4c344e'
+md5sums=('0594bc219f4fd8a0e8663330619829b5'
          'cae664b8ef44d01783dade9088e25b53'
-         '06b572524c0e419d91c81d84c169358b'
-         '5cfc5d7bf548dd0dd3b6ac3708daccb7'
-         'da7a52451ce31c9269211b309f9ebe1c'
+         '5545ddfc50e0f517ee59fff054a3f866'
+         '54181476ea043812e658ddf08d997734'
+         'f5b4e5e24ad8bdffb12a3bdb6b08d2de'
          'SKIP')
 
 pkgver() {
@@ -99,7 +99,7 @@ package() {
 	install -D -m644 ../slurmctld.service   "${pkgdir}/usr/lib/systemd/system/slurmctld.service"
 	install -D -m644 ../slurmd.service      "${pkgdir}/usr/lib/systemd/system/slurmd.service"
 	install -D -m644 ../slurmdbd.service    "${pkgdir}/usr/lib/systemd/system/slurmdbd.service"
-	install -D -m644 ../slurm-tmpfiles.conf "${pkgdir}/etc/tmpfiles.d/slurm-tmpfiles.conf"
+	install -D -m644 ../slurm-tmpfiles.conf "${pkgdir}/usr/lib/tmpfiles.d/slurm-tmpfiles.conf"
 
 	# creating a log and a lib dir
 	install -d -m755 "${pkgdir}/var/log/slurm-llnl"
diff --git a/slurm-tmpfiles.conf b/slurm-tmpfiles.conf
index f50c8df8e918..301151bb1bc0 100644
--- a/slurm-tmpfiles.conf
+++ b/slurm-tmpfiles.conf
@@ -1,4 +1,3 @@
-d /var/log/slurm 0755 root root -
 d /var/spool/slurm 0755 slurm slurm -
 d /var/spool/slurm/slurmctld 0755 slurm slurm -
 d /var/spool/slurm/slurmd 0755 root root -
diff --git a/slurmctld.service b/slurmctld.service
index 543bb55f0f23..a56d39c41b70 100644
--- a/slurmctld.service
+++ b/slurmctld.service
@@ -9,7 +9,7 @@ Type=forking
 EnvironmentFile=-/etc/default/slurm-llnl
 ExecStart=/usr/bin/slurmctld $SLURMCTLD_OPTIONS
 ExecReload=/bin/kill -HUP $MAINPID
-PIDFile=/run/slurm-llnl/slurmctld.pid
+PIDFile=/run/slurmctld.pid
 
 [Install]
 WantedBy=multi-user.target
diff --git a/slurmd.service b/slurmd.service
index 35629cf3bda9..4b43e5fbd52f 100644
--- a/slurmd.service
+++ b/slurmd.service
@@ -9,7 +9,7 @@ Type=forking
 EnvironmentFile=-/etc/default/slurm-llnl
 ExecStart=/usr/bin/slurmd $SLURMD_OPTIONS
 ExecReload=/bin/kill -HUP $MAINPID
-PIDFile=/run/slurm-llnl/slurmd.pid
+PIDFile=/run/slurmd.pid
 KillMode=process
 LimitNOFILE=51200
 LimitMEMLOCK=infinity
diff --git a/slurmdbd.service b/slurmdbd.service
index 5ac617854f62..a46e39f89c6a 100644
--- a/slurmdbd.service
+++ b/slurmdbd.service
@@ -8,7 +8,7 @@ Type=forking
 EnvironmentFile=-/etc/default/slurm-llnl
 ExecStart=/usr/bin/slurmdbd $SLURMDBD_OPTIONS
 ExecReload=/bin/kill -HUP $MAINPID
-PIDFile=/run/slurm-llnl/slurmdbd.pid
+PIDFile=/run/slurmdbd.pid
 
 [Install]
 WantedBy=multi-user.target