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@gentoo.org>

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 (file)
index 0000000..459be9d
--- /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 <floppym@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/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 3403bfbf099d0015bed8aaeccccd5b84975d7a11..1297d2c0d74c9cdb302f3cb46c11bbd64f51150f 100644 (file)
--- 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