Blame SOURCES/bz1808468-1-lvmlockd-fix-conditionals.patch
|
 |
b4b3ce |
From 0a299ee9a00ec9e2dccdcf6a4132e55a9207daa5 Mon Sep 17 00:00:00 2001
|
|
|
b4b3ce |
From: Zhao Heming <heming.zhao@suse.com>
|
|
|
b4b3ce |
Date: Mon, 24 Feb 2020 11:22:34 +0800
|
|
|
b4b3ce |
Subject: [PATCH] [lvmlockd] support lvm2-2.03 removing lvmetad
|
|
|
b4b3ce |
|
|
|
b4b3ce |
Signed-off-by: Zhao Heming <heming.zhao@suse.com>
|
|
|
b4b3ce |
---
|
|
|
b4b3ce |
heartbeat/lvmlockd | 4 ++--
|
|
|
b4b3ce |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
b4b3ce |
|
|
|
b4b3ce |
diff --git a/heartbeat/lvmlockd b/heartbeat/lvmlockd
|
|
|
b4b3ce |
index 3c8c69cc9..e80c7647e 100755
|
|
|
b4b3ce |
--- a/heartbeat/lvmlockd
|
|
|
b4b3ce |
+++ b/heartbeat/lvmlockd
|
|
|
b4b3ce |
@@ -196,11 +196,11 @@ setup_lvm_config()
|
|
|
b4b3ce |
out=$(lvmconfig 'global/locking_type')
|
|
|
b4b3ce |
lock_type=$(echo "$out" | cut -d'=' -f2)
|
|
|
b4b3ce |
|
|
|
b4b3ce |
- if [ "$use_lvmlockd" -ne 1 ] ; then
|
|
|
b4b3ce |
+ if [ "$use_lvmlockd" != 1 ] ; then
|
|
|
b4b3ce |
ocf_log info "setting \"use_lvmlockd=1\" in /etc/lvm/lvm.conf ..."
|
|
|
b4b3ce |
sed -i 's,^[[:blank:]]*use_lvmlockd[[:blank:]]*=.*,\ \ \ \ use_lvmlockd = 1,g' /etc/lvm/lvm.conf
|
|
|
b4b3ce |
fi
|
|
|
b4b3ce |
- if [ "$lock_type" -ne 1 ] ; then
|
|
|
b4b3ce |
+ if [ "$lock_type" != 1 ] ; then
|
|
|
b4b3ce |
ocf_log info "setting \"locking_type=1\" in /etc/lvm/lvm.conf ..."
|
|
|
b4b3ce |
sed -i 's,^[[:blank:]]*locking_type[[:blank:]]*=.*,\ \ \ \ locking_type = 1,g' /etc/lvm/lvm.conf
|
|
|
b4b3ce |
fi
|