[gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/files/

[Thomas Deutschmann]

commit:     3958b1dd77ce75c3d2077acc62b4babc8419a9e6
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 14 17:40:16 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Apr 14 18:34:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3958b1dd

sys-fs/lvm2: runscript: unify $lvm_path handling

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 sys-fs/lvm2/files/lvm.rc-2.02.187 | 17 ++++++-----------
 1 file changed, 6 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 daafffd5b28..1bf8002b9da 100644
--- a/sys-fs/lvm2/files/lvm.rc-2.02.187
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.187
@@ -71,12 +71,10 @@ start() {
 
        # NOTE: Add needed modules for LVM or RAID, etc
        #       to /etc/modules.autoload if needed
+
        lvm_path="$(_get_lvm_path)"
-       for lvm_path in /bin/lvm /sbin/lvm ; do
-               [ -x "${lvm_path}" ] && break
-       done
-       if [ ! -x "${lvm_path}" ] ; then
-               eerror "Cannot find lvm binary in /sbin or /bin!"
+       if [ -z "${lvm_path}" ] ; then
+               eerror "Failed to find lvm binary in /bin or /sbin!"
                return 1
        fi
        if [ -z "${CDBOOT}" ] ; then
@@ -121,12 +119,9 @@ start_post() {
 }
 
 stop() {
-       for lvm_path in /bin/lvm /sbin/lvm ; do
-               [ -x "${lvm_path}" ] && break
-       done
-
-       if [ ! -x "${lvm_path}" ] ; then
-               eerror "Cannot find lvm binary in /sbin or /bin!"
+       lvm_path="$(_get_lvm_path)"
+       if [ -z "${lvm_path}" ] ; then
+               eerror "Failed to find lvm binary in /bin or /sbin!"
                return 1
        fi