upgpkg: slurm-llnl 20.11.0.1-1

upgpkg: slurm-llnl-git 20.11.0.1.r1.g3e495b0ad8-1

5 files changed, 15 insertions, 70 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 08d73760eaa3..3fd9539607b3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
 pkgbase = slurm-llnl-git
 	pkgdesc = Simple Linux Utility for Resource Management (development version)
-	pkgver = 20.11.0.0rc2.r45.g5633b35e64
+	pkgver = 20.11.0.1.r1.g3e495b0ad8
 	pkgrel = 1
 	url = https://www.schedmd.com
-	install = slurm-llnl-git.install
 	arch = i686
 	arch = x86_64
 	arch = armv7h
@@ -28,16 +27,18 @@ pkgbase = slurm-llnl-git
 	optdepends = ncurses: adds the smap command
 	optdepends = gtk2: enables the sview command, a simple graphical frontend
 	optdepends = pmix: support Open MPI applications using PMIx
-	provides = slurm-llnl=20.11.0.0rc2.r45.g5633b35e64
+	provides = slurm-llnl=20.11.0.1.r1.g3e495b0ad8
 	conflicts = slurm-llnl
 	backup = etc/default/slurm-llnl
-	source = slurm-tmpfiles.conf
+	source = slurm-llnl.sysusers
+	source = slurm-llnl.tmpfiles
 	source = slurm-llnl-default-conf
 	source = slurmctld.service
 	source = slurmd.service
 	source = slurmdbd.service
 	source = slurm-llnl-git::git+https://github.com/SchedMD/slurm.git
-	sha512sums = 61f07699353d607ec43bab2a4fe29b4a380dab10108619e67ca2737193ab044a6e263179f7def932660acefd34c790c9d2b301cd6a49d92b8b80deeb1c7b8011
+	sha512sums = 40aa91b02d8839ee94ae106de1ea675b0a79ba533f218afc87e909b5bbd38ce1135f54716094bf9384edc51409bfaeb0b7904cb387cbcbc8ad16befdafb8a5ab
+	sha512sums = 0f1c477be4a06fd6050afd7e4fd7d3524ce4dc9bec4e3f9bbfb0087660a29f76442139b659bc906029757646ac107e521a6b2ba120b5b2db49bc815f501fb581
 	sha512sums = f74dacaaffa35fa11a62bb9efa492bb4ef9b197748f28c15210f362382da27ec1dd88a57a48fc6807029c93c9033c82e11545ea36622c683ae7bd09970ef8710
 	sha512sums = a1c2478a049dc1c024d773a73f363da6c9106d9533137f919394e8213376cb9167c8fcca7b038d1c45c441a1adce4524ccb68b6dd269a1000aba11b84b5352d5
 	sha512sums = ae2d0275bc9e0aac15d0d1dd4913b70ed4d4032e76c9c6ffdeae345c55834219f6495429d1d1c9129779221d6d08bada1228ccdb1c671b05d4a92ed6088bf55c
diff --git a/PKGBUILD b/PKGBUILD
index a6c9a6973063..a3c8320ee180 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Submitter: Fredrik Tegenfeldt <fredrik.tegenfeldt@unige.ch>
 
 pkgname=slurm-llnl-git
-pkgver=20.11.0.0rc2.r45.g5633b35e64
+pkgver=20.11.0.1.r1.g3e495b0ad8
 pkgrel=1
 pkgdesc="Simple Linux Utility for Resource Management (development version)"
 arch=('i686' 'x86_64' 'armv7h')
@@ -30,14 +30,15 @@ makedepends=('python' 'gtk2' 'git')
 provides=("slurm-llnl=${pkgver}")
 conflicts=('slurm-llnl')
 backup=('etc/default/slurm-llnl')
-install="${pkgname}.install"
-source=("slurm-tmpfiles.conf"
+source=("slurm-llnl.sysusers"
+	"slurm-llnl.tmpfiles"
 	"slurm-llnl-default-conf"
 	"slurmctld.service"
 	"slurmd.service"
 	"slurmdbd.service"
 	"${pkgname}"::"git+https://github.com/SchedMD/slurm.git")
-sha512sums=('61f07699353d607ec43bab2a4fe29b4a380dab10108619e67ca2737193ab044a6e263179f7def932660acefd34c790c9d2b301cd6a49d92b8b80deeb1c7b8011'
+sha512sums=('40aa91b02d8839ee94ae106de1ea675b0a79ba533f218afc87e909b5bbd38ce1135f54716094bf9384edc51409bfaeb0b7904cb387cbcbc8ad16befdafb8a5ab'
+            '0f1c477be4a06fd6050afd7e4fd7d3524ce4dc9bec4e3f9bbfb0087660a29f76442139b659bc906029757646ac107e521a6b2ba120b5b2db49bc815f501fb581'
             'f74dacaaffa35fa11a62bb9efa492bb4ef9b197748f28c15210f362382da27ec1dd88a57a48fc6807029c93c9033c82e11545ea36622c683ae7bd09970ef8710'
             'a1c2478a049dc1c024d773a73f363da6c9106d9533137f919394e8213376cb9167c8fcca7b038d1c45c441a1adce4524ccb68b6dd269a1000aba11b84b5352d5'
             'ae2d0275bc9e0aac15d0d1dd4913b70ed4d4032e76c9c6ffdeae345c55834219f6495429d1d1c9129779221d6d08bada1228ccdb1c671b05d4a92ed6088bf55c'
@@ -106,7 +107,8 @@ 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}/usr/lib/tmpfiles.d/slurm-tmpfiles.conf"
+	install -D -m644 ../slurm-llnl.sysusers "${pkgdir}/usr/lib/sysusers.d/slurm-llnl.conf"
+	install -D -m644 ../slurm-llnl.tmpfiles "${pkgdir}/usr/lib/tmpfiles.d/slurm-llnl.conf"
 
 	# Create a log and a lib dir
 	install -d -m755 "${pkgdir}/var/log/slurm-llnl"
diff --git a/slurm-llnl-git.install b/slurm-llnl-git.install
deleted file mode 100644
index 98f9615e03eb..000000000000
--- a/slurm-llnl-git.install
+++ /dev/null
@@ -1,60 +0,0 @@
-post_install() {
-	if ! id slurm >&/dev/null; then
-		echo "Adding slurm system group..."
-		groupadd -g 64030 -r slurm || groupadd -r slurm
-
-		echo "Adding slurm system user..."
-		useradd -r -c "Slurm Daemon" -d /var/log/slurm-llnl -g slurm -u 64030 slurm || useradd -r -c "Slurm Daemon" -d /var/log/slurm-llnl -g slurm slurm
-
-		echo "Locking Slurm User Account..."
-		passwd -l slurm &>/dev/null
-	fi
-
-	# Secure the log dir
-	if [ -d /var/log/slurm-llnl ]; then
-		chown -R slurm:slurm /var/log/slurm-llnl
-	fi
-
-	echo "You have to create a slurm configuration-file in /etc/slurm-llnl/ prior to starting any slurm daemons."
-}
-
-post_upgrade() {
-	# REMOVE ONEDAY - TODO
-	if [[ -f /etc/slurm/slurm.conf ]]; then
-		mv /etc/slurm/* /etc/slurm-llnl/
-		rmdir /etc/slurm
-		echo "Your configuration-files were moved from /etc/slurm to /etc/slurm-llnl !"
-	fi
-}
-
-pre_remove() {
-	if which systemctl >& /dev/null; then
-		echo "Stopping slurm daemons through SystemD..."
-		systemctl stop slurmd.service
-		systemctl stop slurmdbd.service
-		systemctl stop slurmctld.service
-
-		echo "Disabling SystemD related file(s)..."
-		systemctl disable slurmd.service
-		systemctl disable slurmdbd.service
-		systemctl disable slurmctld.service
-	else
-		echo "Stopping slurm daemons..."
-		/etc/rc.d/slurm stop
-		/etc/rc.d/slurmdbd stop
-	fi
-}
-
-post_remove() {
-	# Delete remnant recusivly
-	rm -rf /var/lib/slurm-llnl
-
-	# Change directories which formerly belonged to slurm to be owned by root
-	[[ -d /var/spool/slurm ]] && chown -R root:root /var/spool/slurm
-	# Notify the user of kept dirs
-	[[ -d /etc/slurm-llnl ]] && echo "Custom configuration-file(s) in /etc/slurm-llnl/ were kept on your system."
-	[[ -d /var/log/slurm-llnl ]] && chown -R root:root /var/log/slurm-llnl && echo "Logfiles were preserved. They reside under /var/log/slurm-llnl ."
-
-	echo "Removing slurm system user/group..."
-	userdel slurm
-}
diff --git a/slurm-llnl.sysusers b/slurm-llnl.sysusers
new file mode 100644
index 000000000000..c27f642c3445
--- /dev/null
+++ b/slurm-llnl.sysusers
@@ -0,0 +1 @@
+u slurm 64030 "slurm daemon" /var/log/slurm-llnl /bin/nologin
diff --git a/slurm-tmpfiles.conf b/slurm-llnl.tmpfiles
index 301151bb1bc0..d44008d23639 100644
--- a/slurm-tmpfiles.conf
+++ b/slurm-llnl.tmpfiles
@@ -1,3 +1,4 @@
 d /var/spool/slurm 0755 slurm slurm -
 d /var/spool/slurm/slurmctld 0755 slurm slurm -
 d /var/spool/slurm/slurmd 0755 root root -
+Z /var/log/slurm-llnl - slurm slurm - -