From: Mike Gilbert <floppym@gentoo.org>
Date: Sun, 31 Dec 2017 01:22:17 +0000 (-0500)
Subject: sys-apps/systemd: avoid infinite exec recursion in telinit
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0a0bc30e66759255f4d84527f09c2ccc00fbe0ca;p=gentoo.git

sys-apps/systemd: avoid infinite exec recursion in telinit

Closes: https://bugs.gentoo.org/642724

Package-Manager: Portage-2.3.19_p3, Repoman-2.3.6_p37
---

diff --git a/sys-apps/systemd/systemd-236-r2.ebuild b/sys-apps/systemd/systemd-236-r3.ebuild
similarity index 99%
rename from sys-apps/systemd/systemd-236-r2.ebuild
rename to sys-apps/systemd/systemd-236-r3.ebuild
index 276c398c8a9a..fe6cc466dc03 100644
--- a/sys-apps/systemd/systemd-236-r2.ebuild
+++ b/sys-apps/systemd/systemd-236-r3.ebuild
@@ -205,6 +205,8 @@ multilib_src_configure() {
 		-Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")"
 		-Dsysvinit-path=
 		-Dsysvrcnd-path=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
 		# no deps
 		-Defi=$(meson_multilib)
 		-Dima=true
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index f8eb096a861c..84ede7fddf88 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -204,6 +204,8 @@ multilib_src_configure() {
 		-Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")"
 		-Dsysvinit-path=
 		-Dsysvrcnd-path=
+		# Avoid infinite exec recursion, bug 642724
+		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
 		# no deps
 		-Defi=$(meson_multilib)
 		-Dima=true