| 1 |
commit: 5ee2ced8801f349aeaad982f72736d0b162ba1c1 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 30 02:18:00 2023 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 30 02:18:00 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ee2ced8 |
| 7 |
|
| 8 |
sys-apps/systemd: disable sysvinit compat again |
| 9 |
|
| 10 |
This basically just means that people will need to call systemctl |
| 11 |
instead of using the sysvinit commands if they have sysv-utils diabled. |
| 12 |
|
| 13 |
Disabling the sysvinit compat code lets us drop a distro-specific patch, |
| 14 |
and cleans up some legacy codepaths. |
| 15 |
|
| 16 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 17 |
|
| 18 |
sys-apps/systemd/systemd-9999.ebuild | 4 +++- |
| 19 |
1 file changed, 3 insertions(+), 1 deletion(-) |
| 20 |
|
| 21 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
| 22 |
index ea3aabd5a42f..77c05e37c43e 100644 |
| 23 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 24 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
| 25 |
@@ -236,7 +236,6 @@ src_prepare() { |
| 26 |
if ! use vanilla; then |
| 27 |
PATCHES+=( |
| 28 |
"${FILESDIR}/gentoo-generator-path-r2.patch" |
| 29 |
- "${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch" |
| 30 |
"${FILESDIR}/gentoo-journald-audit-r1.patch" |
| 31 |
) |
| 32 |
fi |
| 33 |
@@ -267,6 +266,9 @@ multilib_src_configure() { |
| 34 |
$(meson_use split-usr split-bin) |
| 35 |
-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")" |
| 36 |
-Drootlibdir="${EPREFIX}/usr/$(get_libdir)" |
| 37 |
+ # Disable compatibility with sysvinit |
| 38 |
+ -Dsysvinit-path= |
| 39 |
+ -Dsysvrcnd-path= |
| 40 |
# Avoid infinite exec recursion, bug 642724 |
| 41 |
-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit" |
| 42 |
# no deps |
Archives