From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 405C8138334 for ; Wed, 26 Dec 2018 04:02:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 17E26E09BE; Wed, 26 Dec 2018 04:02:13 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E51B7E09BE for ; Wed, 26 Dec 2018 04:02:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CFA61335C36 for ; Wed, 26 Dec 2018 04:02:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B59144B for ; Wed, 26 Dec 2018 04:02:07 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1545796921.9f1432cda09ee42e59d6f67279f09140601e8269.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/, sys-apps/systemd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd/files/gentoo-generator-path-r1.patch sys-apps/systemd/systemd-9999.ebuild X-VCS-Directories: sys-apps/systemd/files/ sys-apps/systemd/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 9f1432cda09ee42e59d6f67279f09140601e8269 X-VCS-Branch: master Date: Wed, 26 Dec 2018 04:02:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0cb7bf02-9a3f-4970-b581-839f5e0e7c1a X-Archives-Hash: 3f69e50e443cbe75fe8f8f92d038fc3c commit: 9f1432cda09ee42e59d6f67279f09140601e8269 Author: Mike Gilbert gentoo org> AuthorDate: Wed Dec 26 04:02:01 2018 +0000 Commit: Mike Gilbert gentoo 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 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 +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