commit: 9f1432cda09ee42e59d6f67279f09140601e8269 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Wed Dec 26 04:02:01 2018 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Wed Dec 26 04:02:01 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f1432cd
sys-apps/systemd: update generator-path patch Package-Manager: Portage-2.3.52_p8, Repoman-2.3.12_p20 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> .../systemd/files/gentoo-generator-path-r1.patch | 27 ++++++++++++++++++++++ sys-apps/systemd/systemd-9999.ebuild | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/sys-apps/systemd/files/gentoo-generator-path-r1.patch b/sys-apps/systemd/files/gentoo-generator-path-r1.patch new file mode 100644 index 00000000000..459be9d99ed --- /dev/null +++ b/sys-apps/systemd/files/gentoo-generator-path-r1.patch @@ -0,0 +1,27 @@ +From 3c7918deafa34313b935851171279d8fdb5cfadb Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <[email protected]> +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/shared/path-lookup.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c +index 442fde7b2d..6814164504 100644 +--- a/src/shared/path-lookup.c ++++ b/src/shared/path-lookup.c +@@ -888,6 +888,8 @@ char **generator_binary_paths(UnitFileScope scope) { + return strv_new("/run/systemd/system-generators", + "/etc/systemd/system-generators", + "/usr/local/lib/systemd/system-generators", ++ "/usr/lib/systemd/system-generators", ++ "/lib/systemd/system-generators", + SYSTEM_GENERATOR_PATH); + + case UNIT_FILE_GLOBAL: +-- +2.20.1 + diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 3403bfbf099..1297d2c0d74 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -161,7 +161,7 @@ src_prepare() { "${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch" "${FILESDIR}/gentoo-systemd-user-pam.patch" "${FILESDIR}/gentoo-uucp-group-r1.patch" - "${FILESDIR}/gentoo-generator-path.patch" + "${FILESDIR}/gentoo-generator-path-r1.patch" ) fi
