From: Mikle Kolyada <zlogene@gentoo.org>
Date: Fri, 25 Oct 2019 07:44:12 +0000 (+0300)
Subject: sys-cluster/slurm: fix systemd units earlier (2)
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e8b5c4c300bb4ff2508f423445964f1701268f8e;p=gentoo.git

sys-cluster/slurm: fix systemd units earlier (2)

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
---

diff --git a/sys-cluster/slurm/slurm-18.08.7.ebuild b/sys-cluster/slurm/slurm-18.08.7.ebuild
index 69c7fcf16db3..099916081505 100644
--- a/sys-cluster/slurm/slurm-18.08.7.ebuild
+++ b/sys-cluster/slurm/slurm-18.08.7.ebuild
@@ -107,6 +107,7 @@ src_prepare() {
 	sed \
 		-e 's:sysconfig/.*:conf.d/slurm:g' \
 		-e 's:var/run/:run/slurm/:g' \
+		-e '/^EnvironmentFile=.*/d' \
 		-i "${S}/etc"/*.service.in \
 		|| die "Can't sed systemd services for sysconfig or var/run/"
 
@@ -216,12 +217,6 @@ src_install() {
 	# install systemd files
 	systemd_newtmpfilesd "${FILESDIR}/slurm.tmpfiles" slurm.conf
 	systemd_dounit etc/slurmd.service etc/slurmctld.service etc/slurmdbd.service
-
-	cd "${D}"/lib/systemd/system || die
-
-	for file in slurm*; do
-		sed -i -e '/^EnvironmentFile=.*/d' ${file} || die
-	done
 }
 
 pkg_preinst() {