diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2020-04-17 12:35:14 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2020-04-17 12:35:14 -0400 |
| commit | 0ea30d0d62cb1a52dbc575bba34e286209e6bcc4 (patch) | |
| tree | 06b7572bbae097c250e64ab7c1f20219d1bccf5a | |
| parent | sys-kernel/installkernel-gentoo: stable 2 for hppa, bug #717676 (diff) | |
| download | gentoo-0ea30d0d62cb1a52dbc575bba34e286209e6bcc4.tar.gz gentoo-0ea30d0d62cb1a52dbc575bba34e286209e6bcc4.tar.bz2 gentoo-0ea30d0d62cb1a52dbc575bba34e286209e6bcc4.zip | |
sys-apps/systemd: update generator-path patch
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
| -rw-r--r-- | sys-apps/systemd/files/gentoo-generator-path-r2.patch | 26 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-9999.ebuild | 2 |
2 files changed, 27 insertions, 1 deletions
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 000000000000..46e5c1dacb8d --- /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 <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/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 79adf7db45a6..dcf64e48a2af 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 |