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 D44DD138334 for ; Thu, 23 May 2019 08:28:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AF214E0825; Thu, 23 May 2019 08:28:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 03CE7E0825 for ; Thu, 23 May 2019 08:28:24 +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 A8F94344DEC for ; Thu, 23 May 2019 08:28:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1AEBC5B5 for ; Thu, 23 May 2019 08:28:20 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1558600093.a5a3dfe9ab42181414c267e7ca25d613fb1ced75.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/open-iscsi/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-block/open-iscsi/open-iscsi-2.0.877.ebuild X-VCS-Directories: sys-block/open-iscsi/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: a5a3dfe9ab42181414c267e7ca25d613fb1ced75 X-VCS-Branch: master Date: Thu, 23 May 2019 08:28:20 +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: d40a3bda-119f-4c28-9221-1e6059954d10 X-Archives-Hash: 47cf1c40cb5fef9dd5960291b4d070d5 commit: a5a3dfe9ab42181414c267e7ca25d613fb1ced75 Author: Lars Wendler gentoo org> AuthorDate: Thu May 23 08:27:53 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu May 23 08:28:13 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5a3dfe9 sys-block/open-iscsi: Fixed path in systemd unit files Install all upstream provided systemd unit/socket files. Closes: https://bugs.gentoo.org/672376 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> sys-block/open-iscsi/open-iscsi-2.0.877.ebuild | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys-block/open-iscsi/open-iscsi-2.0.877.ebuild b/sys-block/open-iscsi/open-iscsi-2.0.877.ebuild index a07c19fa6c3..3c166cfb0a4 100644 --- a/sys-block/open-iscsi/open-iscsi-2.0.877.ebuild +++ b/sys-block/open-iscsi/open-iscsi-2.0.877.ebuild @@ -72,7 +72,10 @@ pkg_setup() { } src_prepare() { - sed -i -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' etc/iscsid.conf || die + sed -e 's:^\(iscsid.startup\)\s*=.*:\1 = /usr/sbin/iscsid:' \ + -i etc/iscsid.conf || die + sed -e 's@\(/sbin/\)@/usr\1@' \ + -i etc/systemd/iscsi* || die default pushd iscsiuio >/dev/null || die @@ -112,7 +115,9 @@ src_install() { newconfd "${FILESDIR}"/iscsid-conf.d iscsid newinitd "${FILESDIR}"/iscsid-init.d iscsid - systemd_dounit "${S}"/etc/systemd/iscsid.service + systemd_dounit etc/systemd/iscsi.service + systemd_dounit etc/systemd/iscsid.service + systemd_dounit etc/systemd/iscsid.socket keepdir /var/db/iscsi fperms 700 /var/db/iscsi