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 652D0138350 for ; Wed, 22 Apr 2020 15:45:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 927BEE0E63; Wed, 22 Apr 2020 15:45:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 78359E0E63 for ; Wed, 22 Apr 2020 15:45:39 +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 52AE534EDF6 for ; Wed, 22 Apr 2020 15:45:37 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 53AB89C for ; Wed, 22 Apr 2020 15:45:05 +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: <1587570284.171bc0144212041972ae2e877078cf073b8252a5.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/files/, sys-fs/lvm2/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/lvm2/files/lvm.rc-2.02.187 sys-fs/lvm2/lvm2-2.02.187-r1.ebuild sys-fs/lvm2/lvm2-2.02.187-r2.ebuild X-VCS-Directories: sys-fs/lvm2/ sys-fs/lvm2/files/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 171bc0144212041972ae2e877078cf073b8252a5 X-VCS-Branch: master Date: Wed, 22 Apr 2020 15:45:05 +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: d6f4b4d4-c9f6-4ce2-b1d5-3680d676e85a X-Archives-Hash: b864a7da4d58ca1daa10760910d1e370 commit: 171bc0144212041972ae2e877078cf073b8252a5 Author: Thomas Deutschmann gentoo org> AuthorDate: Wed Apr 22 15:44:44 2020 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Apr 22 15:44:44 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=171bc014 sys-fs/lvm2: use rc_want instead of rc_use Closes: https://bugs.gentoo.org/718748 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Thomas Deutschmann gentoo.org> sys-fs/lvm2/files/lvm.rc-2.02.187 | 22 +++++++++++----------- ...-2.02.187-r1.ebuild => lvm2-2.02.187-r2.ebuild} | 0 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.187 b/sys-fs/lvm2/files/lvm.rc-2.02.187 index 84e799c32f0..3468adc90f6 100644 --- a/sys-fs/lvm2/files/lvm.rc-2.02.187 +++ b/sys-fs/lvm2/files/lvm.rc-2.02.187 @@ -25,22 +25,22 @@ _use_lvmlockd() { depend() { before checkfs fsck after modules device-mapper - # We may use lvmetad based on the configuration. If we added lvmetad + # We may want lvmetad based on the configuration. If we added lvmetad # support while lvm2 is running then we aren't dependent on it. For the # more common case, if its disabled in the config we aren't dependent # on it. config /etc/lvm/lvm.conf - local _use= + local _want= if service_started ; then - _use=$(service_get_value use) + _want=$(service_get_value want) else if _use_lvmetad ; then - _use="${_use} lvmetad" + _want="${_want} lvmetad" fi if _use_lvmlockd ; then - _use="${_use} lvmlockd" + _want="${_want} lvmlockd" fi fi @@ -48,8 +48,8 @@ depend() { # Depending on your system, it might also introduce udev & mdraid need sysfs - if [ -n "${_use}" ] ; then - use ${_use} + if [ -n "${_want}" ] ; then + want ${_want} fi } @@ -118,16 +118,16 @@ start() { } start_post() { - local _use= + local _want= if _use_lvmetad ; then - _use="${_use} lvmetad" + _want="${_want} lvmetad" fi if _use_lvmlockd ; then - _use="${_use} lvmlockd" + _want="${_want} lvmlockd" fi - service_set_value use "${_use}" + service_set_value want "${_want}" } stop() { diff --git a/sys-fs/lvm2/lvm2-2.02.187-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild similarity index 100% rename from sys-fs/lvm2/lvm2-2.02.187-r1.ebuild rename to sys-fs/lvm2/lvm2-2.02.187-r2.ebuild