summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-apps/systemd/systemd-236-r3.ebuild (renamed from sys-apps/systemd/systemd-236-r2.ebuild)2
-rw-r--r--sys-apps/systemd/systemd-9999.ebuild2
2 files changed, 4 insertions, 0 deletions
diff --git a/sys-apps/systemd/systemd-236-r2.ebuild b/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