From beeec7c375820fa7b7ec60280848d51d8f6d7a86 Mon Sep 17 00:00:00 2001 From: David Michael Date: Mon, 6 Nov 2017 15:31:13 -0500 Subject: [PATCH] sys-apps/systemd: "Fix" telinit in the SDK When telinit is run and doesn't detect the host systemd, it falls back to executing a default fallback program that is detected by meson. In this case, it detects itself at /sbin/telinit, so it enters an infinite exec loop. Change the default fallback program to a non-existent path so that telinit just fails in the SDK. --- .../systemd/{systemd-235.ebuild => systemd-235-r1.ebuild} | 0 .../coreos-overlay/sys-apps/systemd/systemd-9999.ebuild | 3 +++ 2 files changed, 3 insertions(+) rename sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/{systemd-235.ebuild => systemd-235-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-235.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-235-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-235.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-235-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild index 2911984fe5..ac305174b9 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild @@ -263,6 +263,9 @@ multilib_src_configure() { ### CoreOS options + # Point to a bad path, or telinit in the SDK re-execs itself + -Dtelinit-path=/lib/sysvinit/telinit + # Specify this, or meson breaks due to no /etc/login.defs -Dsystem-gid-max=999 -Dsystem-uid-max=999