Upgpkg: 26981.fc4db49-1

Remove ExecStartPre=mkdir ... from systemd service files since those
directories should already exist.
Indent .install file.

6 files changed, 36 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ca644c723864..bc593b553997 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Thu Jan 21 09:58:49 UTC 2016
 pkgbase = slurm-llnl-git
 	pkgdesc = Simple Linux Utility for Resource Management (development version)
-	pkgver = 26755.565ccbe
+	pkgver = 26981.fc4db49
 	pkgrel = 1
 	url = http://www.schedmd.com
 	install = slurm-llnl-git.install
@@ -37,9 +39,9 @@ pkgbase = slurm-llnl-git
 	source = slurm-llnl-git::git+https://github.com/SchedMD/slurm.git
 	md5sums = 51e4ae2c51edf7c145d1b87bec4c344e
 	md5sums = cae664b8ef44d01783dade9088e25b53
-	md5sums = 31899d7a4caaa7bdb8b987afae191b56
-	md5sums = 72a4cddcef47bdc989d49d02ee698e55
-	md5sums = cd89bfa37d6b3108fc17c531a27183a0
+	md5sums = 834b641efbcb45d300630f51f08a9122
+	md5sums = 231a6634fcf774642021377920fffe39
+	md5sums = cef9d45137b9bd431dce3cbe85ef9bca
 	md5sums = SKIP
 
 pkgname = slurm-llnl-git
diff --git a/PKGBUILD b/PKGBUILD
index 9e7bf318125d..e875290ab3f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Submitter: Fredrik Tegenfeldt <fredrik.tegenfeldt@unige.ch>
 
 pkgname=slurm-llnl-git
-pkgver=26755.565ccbe
+pkgver=26981.fc4db49
 pkgrel=1
 pkgdesc="Simple Linux Utility for Resource Management (development version)"
 arch=('i686' 'x86_64')
@@ -37,11 +37,11 @@ source=("slurm-tmpfiles.conf"
 	"slurmdbd.service"
 	"${pkgname}"::"git+https://github.com/SchedMD/slurm.git")
 md5sums=('51e4ae2c51edf7c145d1b87bec4c344e'
-	'cae664b8ef44d01783dade9088e25b53'
-	'31899d7a4caaa7bdb8b987afae191b56'
-	'72a4cddcef47bdc989d49d02ee698e55'
-	'cd89bfa37d6b3108fc17c531a27183a0'
-	'SKIP')
+         'cae664b8ef44d01783dade9088e25b53'
+         '834b641efbcb45d300630f51f08a9122'
+         '231a6634fcf774642021377920fffe39'
+         'cef9d45137b9bd431dce3cbe85ef9bca'
+         'SKIP')
 
 pkgver() {
 	cd "${srcdir}/${pkgname}"
diff --git a/slurm-llnl-git.install b/slurm-llnl-git.install
index 6a5b576e78c4..e414635d98d9 100644
--- a/slurm-llnl-git.install
+++ b/slurm-llnl-git.install
@@ -2,21 +2,21 @@
 post_install() {
 	id slurm >&/dev/null
 	if [ $? -ne 0 ]; then
-	echo -e "\e[34;1m==>\e[39;1m Adding slurm system group... \e[0m"
-	groupadd -g 64030 -r slurm
-	[ $? -ne 0 ] && groupadd -r slurm
+		echo -e "\e[34;1m==>\e[39;1m Adding slurm system group... \e[0m"
+		groupadd -g 64030 -r slurm
+		[ $? -ne 0 ] && groupadd -r slurm
 
-	echo -e "\e[34;1m==>\e[39;1m Adding slurm system user... \e[0m"
-	useradd -r -c "Slurm Daemon" -d /var/log/slurm-llnl -g slurm -u 64030 slurm
-	[ $? -ne 0 ] && useradd -r -c "Slurm Daemon" -d /var/log/slurm-llnl -g slurm slurm
+		echo -e "\e[34;1m==>\e[39;1m Adding slurm system user... \e[0m"
+		useradd -r -c "Slurm Daemon" -d /var/log/slurm-llnl -g slurm -u 64030 slurm
+		[ $? -ne 0 ] && useradd -r -c "Slurm Daemon" -d /var/log/slurm-llnl -g slurm slurm
 
-	echo -e "\e[34;1m==>\e[39;1m Locking Slurm User Account...\e[0m"
-	passwd -l slurm &>/dev/null
+		echo -e "\e[34;1m==>\e[39;1m Locking Slurm User Account...\e[0m"
+		passwd -l slurm &>/dev/null
 	fi
 
 	# securing the log dir
 	if [ -d /var/log/slurm-llnl ]; then
-	chown -R slurm:slurm /var/log/slurm-llnl
+		chown -R slurm:slurm /var/log/slurm-llnl
 	fi
 
 	echo -e "\e[34;1m==>\e[39;1m NOTE: You have to create a slurm configuration-file in /etc/slurm-llnl/ \e[0m"
@@ -33,9 +33,9 @@ post_upgrade() {
 
 	# THIS HAS TO BE REMOVED ONEDAY - TODO
 	if [ -f /etc/slurm/slurm.conf ]; then
-	mv /etc/slurm/* /etc/slurm-llnl/
-	rmdir /etc/slurm
-	echo -e "\e[34;1m==>\e[39;1m Your configuration-files were moved from /etc/slurm to /etc/slurm-llnl ! \e[0m"
+		mv /etc/slurm/* /etc/slurm-llnl/
+		rmdir /etc/slurm
+		echo -e "\e[34;1m==>\e[39;1m Your configuration-files were moved from /etc/slurm to /etc/slurm-llnl ! \e[0m"
 	fi
 }
 
@@ -43,19 +43,19 @@ post_upgrade() {
 pre_remove() {
 	which systemctl >& /dev/null
 	if [ $? -eq 0 ]; then
-	echo -e "\e[34;1m==>\e[39;1m Stopping slurm daemons through SystemD... \e[0m"
-	systemctl stop slurmd.service
-	systemctl stop slurmdbd.service
-	systemctl stop slurmctld.service
+		echo -e "\e[34;1m==>\e[39;1m Stopping slurm daemons through SystemD... \e[0m"
+		systemctl stop slurmd.service
+		systemctl stop slurmdbd.service
+		systemctl stop slurmctld.service
 
-	echo -e "\e[34;1m==>\e[39;1m Disabling SystemD related file(s)... \e[0m"
-	systemctl disable slurmd.service
-	systemctl disable slurmdbd.service
-	systemctl disable slurmctld.service
+		echo -e "\e[34;1m==>\e[39;1m Disabling SystemD related file(s)... \e[0m"
+		systemctl disable slurmd.service
+		systemctl disable slurmdbd.service
+		systemctl disable slurmctld.service
 	else
-	echo -e "\e[34;1m==>\e[39;1m Stopping slurm daemons... \e[0m"
-	/etc/rc.d/slurm stop
-	/etc/rc.d/slurmdbd stop
+		echo -e "\e[34;1m==>\e[39;1m Stopping slurm daemons... \e[0m"
+		/etc/rc.d/slurm stop
+		/etc/rc.d/slurmdbd stop
 	fi
 }
 
@@ -64,7 +64,7 @@ post_remove() {
 	echo -e "\e[34;1m==>\e[39;1m Removing slurm system user/group... \e[0m"
 	userdel slurm
 
-	# deleting remnant recusivly (there shell be now links!)
+	# deleting remnant recusivly
 	rm -rf /var/lib/slurm-llnl
 
 	# notifying the user of kept dirs
diff --git a/slurmctld.service b/slurmctld.service
index 950f18a375ba..a9388b32a146 100644
--- a/slurmctld.service
+++ b/slurmctld.service
@@ -7,7 +7,6 @@ ConditionPathExists=/etc/slurm-llnl/slurm.conf
 [Service]
 Type=simple
 EnvironmentFile=/etc/default/slurm-llnl
-ExecStartPre=/usr/bin/mkdir -p /var/lib/slurm-llnl
 ExecStart=/usr/bin/slurmctld -D $SLURMCTLD_OPTIONS
 PIDFile=/var/run/slurm/slurmctld.pid
 
diff --git a/slurmd.service b/slurmd.service
index 645679b6f37c..382935c2ea3c 100644
--- a/slurmd.service
+++ b/slurmd.service
@@ -7,7 +7,6 @@ ConditionPathExists=/etc/slurm-llnl/slurm.conf
 [Service]
 Type=simple
 EnvironmentFile=/etc/default/slurm-llnl
-ExecStartPre=/usr/bin/mkdir -p /var/lib/slurm-llnl
 ExecStart=/usr/bin/slurmd -D $SLURMD_OPTIONS
 PIDFile=/var/run/slurm/slurmd.pid
 
diff --git a/slurmdbd.service b/slurmdbd.service
index 9097a59f2ebd..262db447468b 100644
--- a/slurmdbd.service
+++ b/slurmdbd.service
@@ -6,7 +6,6 @@ ConditionPathExists=/etc/slurm-llnl/slurmdbd.conf
 [Service]
 Type=simple
 EnvironmentFile=/etc/default/slurm-llnl
-ExecStartPre=/usr/bin/mkdir -p /var/lib/slurm-llnl
 ExecStart=/usr/bin/slurmdbd -D $SLURMDBD_OPTIONS
 PIDFile=/var/run/slurm/slurmdbd.pid