From 0a0bc30e66759255f4d84527f09c2ccc00fbe0ca Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sat, 30 Dec 2017 20:22:17 -0500 Subject: [PATCH] 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 --- .../systemd/{systemd-236-r2.ebuild => systemd-236-r3.ebuild} | 2 ++ sys-apps/systemd/systemd-9999.ebuild | 2 ++ 2 files changed, 4 insertions(+) rename sys-apps/systemd/{systemd-236-r2.ebuild => systemd-236-r3.ebuild} (99%) 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 -- 2.26.2