commit: 0a0bc30e66759255f4d84527f09c2ccc00fbe0ca Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sun Dec 31 01:22:17 2017 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Dec 31 01:25:36 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a0bc30e
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 sys-apps/systemd/{systemd-236-r2.ebuild => systemd-236-r3.ebuild} | 2 ++ sys-apps/systemd/systemd-9999.ebuild | 2 ++ 2 files changed, 4 insertions(+) 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 276c398c8a9..fe6cc466dc0 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 f8eb096a861..84ede7fddf8 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
