From 47f455cbe66025c9cfcbf8f3bc7be9ad2f449044 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Thu, 9 Jun 2022 08:12:22 +0000
Subject: [PATCH] Auto sync2gitlab import of
 resource-agents-4.9.0-20.el8.src.rpm

---
 ...lockd-fail-when-use_lvmlockd-not-set.patch | 25 +++++++++++++++++++
 resource-agents.spec                          |  9 ++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 bz2086889-lvmlockd-fail-when-use_lvmlockd-not-set.patch

diff --git a/bz2086889-lvmlockd-fail-when-use_lvmlockd-not-set.patch b/bz2086889-lvmlockd-fail-when-use_lvmlockd-not-set.patch
new file mode 100644
index 0000000..8400437
--- /dev/null
+++ b/bz2086889-lvmlockd-fail-when-use_lvmlockd-not-set.patch
@@ -0,0 +1,25 @@
+From b3885f7d95fe390371f806c7f3debb3ec8ad012d Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Tue, 7 Jun 2022 15:20:11 +0200
+Subject: [PATCH] lvmlockd: fail when use_lvmlockd has not been set
+
+---
+ heartbeat/lvmlockd | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/heartbeat/lvmlockd b/heartbeat/lvmlockd
+index 05bb0a2e5..dc7bd2d7e 100755
+--- a/heartbeat/lvmlockd
++++ b/heartbeat/lvmlockd
+@@ -179,6 +179,11 @@ setup_lvm_config()
+ 	out=$(lvmconfig 'global/locking_type' 2> /dev/null)
+ 	lock_type=$(echo "$out" | cut -d'=' -f2)
+ 
++	if [ -z "$use_lvmlockd" ]; then
++		ocf_exit_reason "\"use_lvmlockd\" not set in /etc/lvm/lvm.conf ..."
++		exit $OCF_ERR_CONFIGURED
++	fi
++
+ 	if [ -n "$use_lvmlockd" ] && [ "$use_lvmlockd" != 1 ] ; then
+ 		ocf_log info "setting \"use_lvmlockd=1\" in /etc/lvm/lvm.conf ..."
+ 		sed -i 's,^[[:blank:]]*use_lvmlockd[[:blank:]]*=.*,\ \ \ \ use_lvmlockd = 1,g' /etc/lvm/lvm.conf
diff --git a/resource-agents.spec b/resource-agents.spec
index a033895..c51de3c 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -66,7 +66,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.9.0
-Release:	19%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	20%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
@@ -105,6 +105,7 @@ Patch18:	bz1908146-bz1908147-bz1908148-bz1949114-update-openstack-agents.patch
 Patch19:	bz2072043-LVM-activate-fix-fence-issue.patch
 Patch20:	bz2049414-Filesystem-1-fix-uuid-label-device-whitespace.patch
 Patch21:	bz2049414-Filesystem-2-improve-uuid-label-device-logic.patch
+Patch22:	bz2086889-lvmlockd-fail-when-use_lvmlockd-not-set.patch
 
 # bundle patches
 Patch1000:	7-gcp-bundled.patch
@@ -300,6 +301,7 @@ exit 1
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 chmod 755 heartbeat/nova-compute-wait
 chmod 755 heartbeat/NovaEvacuate
@@ -872,6 +874,11 @@ ccs_update_schema > /dev/null 2>&1 ||:
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
+* Wed Jun  8 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-20
+- lvmlockd: fail when use_lvmlockd has not been set
+
+  Resolves: rhbz#2086889
+
 * Thu Apr 21 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-19
 - Filesystem: fix UUID/label device support when there's whitespace
   between parameter and UUID/label