diff options
Diffstat (limited to 'sys-apps/systemd/systemd-9999.ebuild')
| -rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 39a2452355b2..77c05e37c43e 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -236,8 +236,7 @@ src_prepare() { if ! use vanilla; then PATCHES+=( "${FILESDIR}/gentoo-generator-path-r2.patch" - "${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch" - "${FILESDIR}/gentoo-journald-audit.patch" + "${FILESDIR}/gentoo-journald-audit-r1.patch" ) fi @@ -267,6 +266,9 @@ multilib_src_configure() { $(meson_use split-usr split-bin) -Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" -Drootlibdir="${EPREFIX}/usr/$(get_libdir)" + # Disable compatibility with sysvinit + -Dsysvinit-path= + -Dsysvrcnd-path= # Avoid infinite exec recursion, bug 642724 -Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit" # no deps |