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 276c398c8a9a4a38d04cd56b5fdce5caf98f8df1..fe6cc466dc031467591580db08dfac4cd5829c79 100644 (file)
--- 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 f8eb096a861c95bdd7dbd8d519382046f40d2e7e..84ede7fddf880c43a56b8ceb8dc39273f3c1cc2a 100644 (file)
--- 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