From 171bc0144212041972ae2e877078cf073b8252a5 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Wed, 22 Apr 2020 17:44:44 +0200 Subject: [PATCH] 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 --- sys-fs/lvm2/files/lvm.rc-2.02.187 | 22 +++++++++---------- ....187-r1.ebuild => lvm2-2.02.187-r2.ebuild} | 0 2 files changed, 11 insertions(+), 11 deletions(-) rename sys-fs/lvm2/{lvm2-2.02.187-r1.ebuild => lvm2-2.02.187-r2.ebuild} (100%) diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.187 b/sys-fs/lvm2/files/lvm.rc-2.02.187 index 84e799c32f03..3468adc90f61 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 -- 2.26.2