commit: 4b96b826237c2ba711b79c8fa5b1980004bd5d9b Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Mon Apr 27 14:26:44 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon Apr 27 14:40:51 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b96b826
sys-apps/systemd: disable sysv init script sync Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> .../files/gentoo-systemctl-disable-sysv-sync.patch | 25 ++++++++++++++++++++++ ...systemd-245-r4.ebuild => systemd-245-r5.ebuild} | 1 + sys-apps/systemd/systemd-9999.ebuild | 1 + 3 files changed, 27 insertions(+) diff --git a/sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync.patch b/sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync.patch new file mode 100644 index 00000000000..d92d2d43a0c --- /dev/null +++ b/sys-apps/systemd/files/gentoo-systemctl-disable-sysv-sync.patch @@ -0,0 +1,25 @@ +From 7ccd5724afc6fa83ec6cd93dbaf4faf3671c88fc Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <[email protected]> +Date: Mon, 27 Apr 2020 10:22:03 -0400 +Subject: [PATCH] systemctl: disable synchronizaion of sysv init scripts + +--- + src/systemctl/systemctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c +index d319d5d375..bb8419800c 100644 +--- a/src/systemctl/systemctl.c ++++ b/src/systemctl/systemctl.c +@@ -6622,7 +6622,7 @@ static int import_environment(int argc, char *argv[], void *userdata) { + static int enable_sysv_units(const char *verb, char **args) { + int r = 0; + +-#if HAVE_SYSV_COMPAT ++#if 0 + _cleanup_(lookup_paths_free) LookupPaths paths = {}; + unsigned f = 0; + +-- +2.26.2 + diff --git a/sys-apps/systemd/systemd-245-r4.ebuild b/sys-apps/systemd/systemd-245-r5.ebuild similarity index 99% rename from sys-apps/systemd/systemd-245-r4.ebuild rename to sys-apps/systemd/systemd-245-r5.ebuild index b686b0a738b..46c7844250b 100644 --- a/sys-apps/systemd/systemd-245-r4.ebuild +++ b/sys-apps/systemd/systemd-245-r5.ebuild @@ -209,6 +209,7 @@ src_prepare() { "${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch" "${FILESDIR}/gentoo-systemd-user-pam.patch" "${FILESDIR}/gentoo-generator-path-r1.patch" + "${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch" ) fi diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index c692b2d9f5d..b755eb2883e 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -208,6 +208,7 @@ src_prepare() { "${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch" "${FILESDIR}/gentoo-systemd-user-pam.patch" "${FILESDIR}/gentoo-generator-path-r2.patch" + "${FILESDIR}/gentoo-systemctl-disable-sysv-sync.patch" ) fi
