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 69c7fcf16db31c9c4fde56f44ba560b2e10f1467..099916081505aebc2f46f322e24fd3e51a603edd 100644 (file)
--- 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() {