commit: 5ee2ced8801f349aeaad982f72736d0b162ba1c1 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Mon Jan 30 02:18:00 2023 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon Jan 30 02:18:00 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ee2ced8
sys-apps/systemd: disable sysvinit compat again This basically just means that people will need to call systemctl instead of using the sysvinit commands if they have sysv-utils diabled. Disabling the sysvinit compat code lets us drop a distro-specific patch, and cleans up some legacy codepaths. Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> sys-apps/systemd/systemd-9999.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index ea3aabd5a42f..77c05e37c43e 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -236,7 +236,6 @@ 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-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