From: gaoyi <ymuemc@163.com>
Date: Wed, 14 Aug 2019 12:55:56 +0000 (-0400)
Subject: dracut: check_vol_slaves_all must return 1 when lvm vgs failed
X-Git-Tag: 050~139
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da36b76ab0bbf9b2853d88023dca146253c4008c;p=thirdparty%2Fdracut.git

dracut: check_vol_slaves_all must return 1 when lvm vgs failed

reason:when filter/global_filter is set in lvm.conf, lvm vgs may be
failed

Signed-off-by: gaoyi <ymuemc@163.com>
---

diff --git a/dracut-functions.sh b/dracut-functions.sh
index d756a463e..229405405 100755
--- a/dracut-functions.sh
+++ b/dracut-functions.sh
@@ -592,6 +592,12 @@ check_vol_slaves_all() {
     # strip space
     _vg="${_vg//[[:space:]]/}"
     if [[ $_vg ]]; then
+        # when filter/global_filter is set, lvm may be failed
+        lvm lvs --noheadings -o vg_name $_vg 2>/dev/null 1>/dev/null
+        if [ $? -ne 0 ]; then
+             return 1
+        fi
+
         for _pv in $(lvm vgs --noheadings -o pv_name "$_vg" 2>/dev/null)
         do
             check_block_and_slaves_all $1 $(get_maj_min $_pv)