| 1 |
commit: 0a0bc30e66759255f4d84527f09c2ccc00fbe0ca |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 31 01:22:17 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 31 01:25:36 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a0bc30e |
| 7 |
|
| 8 |
sys-apps/systemd: avoid infinite exec recursion in telinit |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/642724 |
| 11 |
|
| 12 |
Package-Manager: Portage-2.3.19_p3, Repoman-2.3.6_p37 |
| 13 |
|
| 14 |
sys-apps/systemd/{systemd-236-r2.ebuild => systemd-236-r3.ebuild} | 2 ++ |
| 15 |
sys-apps/systemd/systemd-9999.ebuild | 2 ++ |
| 16 |
2 files changed, 4 insertions(+) |
| 17 |
|
| 18 |
diff --git a/sys-apps/systemd/systemd-236-r2.ebuild b/sys-apps/systemd/systemd-236-r3.ebuild |
| 19 |
similarity index 99% |
| 20 |
rename from sys-apps/systemd/systemd-236-r2.ebuild |
| 21 |
rename to sys-apps/systemd/systemd-236-r3.ebuild |
| 22 |
index 276c398c8a9..fe6cc466dc0 100644 |
| 23 |
--- a/sys-apps/systemd/systemd-236-r2.ebuild |
| 24 |
+++ b/sys-apps/systemd/systemd-236-r3.ebuild |
| 25 |
@@ -205,6 +205,8 @@ multilib_src_configure() { |
| 26 |
-Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")" |
| 27 |
-Dsysvinit-path= |
| 28 |
-Dsysvrcnd-path= |
| 29 |
+ # Avoid infinite exec recursion, bug 642724 |
| 30 |
+ -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit" |
| 31 |
# no deps |
| 32 |
-Defi=$(meson_multilib) |
| 33 |
-Dima=true |
| 34 |
|
| 35 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
| 36 |
index f8eb096a861..84ede7fddf8 100644 |
| 37 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 38 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
| 39 |
@@ -204,6 +204,8 @@ multilib_src_configure() { |
| 40 |
-Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")" |
| 41 |
-Dsysvinit-path= |
| 42 |
-Dsysvrcnd-path= |
| 43 |
+ # Avoid infinite exec recursion, bug 642724 |
| 44 |
+ -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit" |
| 45 |
# no deps |
| 46 |
-Defi=$(meson_multilib) |
| 47 |
-Dima=true |
Archives