commit: 0ea30d0d62cb1a52dbc575bba34e286209e6bcc4 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Fri Apr 17 16:35:14 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Fri Apr 17 16:35:14 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ea30d0d
sys-apps/systemd: update generator-path patch Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> .../systemd/files/gentoo-generator-path-r2.patch | 26 ++++++++++++++++++++++ sys-apps/systemd/systemd-9999.ebuild | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/sys-apps/systemd/files/gentoo-generator-path-r2.patch b/sys-apps/systemd/files/gentoo-generator-path-r2.patch new file mode 100644 index 00000000000..46e5c1dacb8 --- /dev/null +++ b/sys-apps/systemd/files/gentoo-generator-path-r2.patch @@ -0,0 +1,26 @@ +From 91182cc273d2dd8325d856fd683d2d8e038abd91 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <flop...@gentoo.org> +Date: Tue, 25 Dec 2018 22:52:50 -0500 +Subject: [PATCH] path-lookup: look for generators in + /usr/lib/systemd/system-generators + +Bug: https://bugs.gentoo.org/625402 +--- + src/basic/path-lookup.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c +index 52968dee34..0cb10b1116 100644 +--- a/src/basic/path-lookup.c ++++ b/src/basic/path-lookup.c +@@ -798,6 +798,7 @@ char **generator_binary_paths(UnitFileScope scope) { + add = strv_new("/run/systemd/system-generators", + "/etc/systemd/system-generators", + "/usr/local/lib/systemd/system-generators", ++ "/usr/lib/systemd/system-generators", + SYSTEM_GENERATOR_DIR); + break; + +-- +2.26.1 + diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 79adf7db45a..dcf64e48a2a 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -207,7 +207,7 @@ src_prepare() { PATCHES+=( "${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch" "${FILESDIR}/gentoo-systemd-user-pam.patch" - "${FILESDIR}/gentoo-generator-path-r1.patch" + "${FILESDIR}/gentoo-generator-path-r2.patch" ) fi
