diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2017-07-17 11:27:38 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2017-07-17 11:27:38 -0400 |
| commit | 3b5be41d4d70c3761351cb4985c7da8f785858c5 (patch) | |
| tree | 1bc6de9235d2f8c306c2eff0fd29bec7467df48e | |
| parent | sys-apps/systemd: add warning to rebuild system generators (diff) | |
| download | gentoo-3b5be41d4d70c3761351cb4985c7da8f785858c5.tar.gz gentoo-3b5be41d4d70c3761351cb4985c7da8f785858c5.tar.bz2 gentoo-3b5be41d4d70c3761351cb4985c7da8f785858c5.zip | |
sys-apps/systemd: look for generators in {,/usr}/lib/systemd/system-generators
Bug: https://bugs.gentoo.org/625402
Package-Manager: Portage-2.3.6_p16, Repoman-2.3.2_p84
| -rw-r--r-- | sys-apps/systemd/files/234-0001-path-lookup-look-for-generators-in-usr-lib-systemd-s.patch | 27 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-234-r1.ebuild (renamed from sys-apps/systemd/systemd-234.ebuild) | 1 |
2 files changed, 28 insertions, 0 deletions
diff --git a/sys-apps/systemd/files/234-0001-path-lookup-look-for-generators-in-usr-lib-systemd-s.patch b/sys-apps/systemd/files/234-0001-path-lookup-look-for-generators-in-usr-lib-systemd-s.patch new file mode 100644 index 000000000000..47e2730a7b37 --- /dev/null +++ b/sys-apps/systemd/files/234-0001-path-lookup-look-for-generators-in-usr-lib-systemd-s.patch @@ -0,0 +1,27 @@ +From d9287b10d714175521e3bcd6c53de4819b1357c5 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert <floppym@gentoo.org> +Date: Mon, 17 Jul 2017 11:21:25 -0400 +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 e2b3f8b74..1ee0e1cdb 100644 +--- a/src/shared/path-lookup.c ++++ b/src/shared/path-lookup.c +@@ -821,6 +821,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, + NULL); + +-- +2.13.3 + diff --git a/sys-apps/systemd/systemd-234.ebuild b/sys-apps/systemd/systemd-234-r1.ebuild index c80965e1c39f..6aaaaf45860e 100644 --- a/sys-apps/systemd/systemd-234.ebuild +++ b/sys-apps/systemd/systemd-234-r1.ebuild @@ -151,6 +151,7 @@ src_prepare() { sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die local PATCHES=( + "${FILESDIR}"/234-0001-path-lookup-look-for-generators-in-usr-lib-systemd-s.patch ) if ! use vanilla; then |