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 52A0A1382C5 for ; Fri, 30 Mar 2018 23:27:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53F5BE090E; Fri, 30 Mar 2018 23:27:34 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 29E13E090E for ; Fri, 30 Mar 2018 23:27:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 A1818335D5C for ; Fri, 30 Mar 2018 23:27:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 05BCF268 for ; Fri, 30 Mar 2018 23:27:31 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1522452442.a31f6aab2671f7cea5d96ff7ca0410bc82df27f4.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/collectd/collectd-5.7.2-r1.ebuild app-admin/collectd/collectd-5.7.2-r2.ebuild X-VCS-Directories: app-admin/collectd/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: a31f6aab2671f7cea5d96ff7ca0410bc82df27f4 X-VCS-Branch: master Date: Fri, 30 Mar 2018 23:27:31 +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-Archives-Salt: 954966f6-8974-4be7-b57f-f6d23fc3a7d1 X-Archives-Hash: 27fd38ed581cdd0c9c9fb155839421c2 commit: a31f6aab2671f7cea5d96ff7ca0410bc82df27f4 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Mar 30 23:26:49 2018 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Mar 30 23:27:22 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a31f6aab app-admin/collectd: Fix pkg_postinst... ...to support systemd's new rootprefix. Closes: https://bugs.gentoo.org/596852 Package-Manager: Portage-2.3.26, Repoman-2.3.7 RepoMan-Options: --force .../{collectd-5.7.2-r1.ebuild => collectd-5.7.2-r2.ebuild} | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app-admin/collectd/collectd-5.7.2-r1.ebuild b/app-admin/collectd/collectd-5.7.2-r2.ebuild similarity index 98% rename from app-admin/collectd/collectd-5.7.2-r1.ebuild rename to app-admin/collectd/collectd-5.7.2-r2.ebuild index aa1d4469965..9adfa6322e1 100644 --- a/app-admin/collectd/collectd-5.7.2-r1.ebuild +++ b/app-admin/collectd/collectd-5.7.2-r2.ebuild @@ -500,7 +500,7 @@ pkg_postinst() { elog " ${caps_str}+EP" elog - local systemd_unit="${EROOT}usr/lib/systemd/system/collectd.service" + local systemd_unit="$(systemd_get_systemunitdir)/collectd.service" if [[ -e "${systemd_unit}" ]]; then caps_str="${caps[*]}" sed -i -e "s:^CapabilityBoundingSet=.*:CapabilityBoundingSet=${caps_str}:" "${systemd_unit}" || \ @@ -509,6 +509,12 @@ pkg_postinst() { elog "CapabilityBoundingSet in '${systemd_unit}'" elog "updated to match capabilities set above." elog + else + if has_version "sys-apps/systemd"; then + # Bug 596852 + ewarn "Failed to update CapabilityBondingSet in '${systemd_unit}'" + ewarn "because unit was not found. Please file a bug about this." + fi fi fi fi