33 lines
1.0 KiB
Diff
33 lines
1.0 KiB
Diff
|
From fc613d0d2ca74a39bd76d4defc5bdf479e921272 Mon Sep 17 00:00:00 2001
|
||
|
|
From: gaoyi <gaoyi15@huawei.com>
|
||
|
|
Date: Wed, 14 Aug 2019 07:22:22 -0400
|
||
|
|
Subject: [PATCH] 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 <gaoyi15@huawei.com>
|
||
|
|
---
|
||
|
|
dracut-functions.sh | 6 ++++++
|
||
|
|
1 file changed, 6 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/dracut-functions.sh b/dracut-functions.sh
|
||
|
|
index 7c408f8..c50d328 100755
|
||
|
|
--- a/dracut-functions.sh
|
||
|
|
+++ b/dracut-functions.sh
|
||
|
|
@@ -595,6 +595,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)
|
||
|
|
--
|
||
|
|
2.19.1
|
||
|
|
|