import sbd-1.4.2-2.el8

SOURCES/0001-Doc-adapt-description-of-startup-shutdown-sync.patch

@@ -0,0 +1,36 @@
+From 542bf70c701083df032eb22cf59f4027ee88e60f Mon Sep 17 00:00:00 2001
+From: Klaus Wenninger <klaus.wenninger@aon.at>
+Date: Thu, 28 Jan 2021 21:46:11 +0100
+Subject: [PATCH] Doc: adapt description of startup/shutdown sync with
+ pacemaker
+
+now that the default is configurable at compile-time
+---
+ src/sbd.sysconfig.in | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/sbd.sysconfig.in b/src/sbd.sysconfig.in
+index 15cd66a..f49d780 100644
+--- a/src/sbd.sysconfig.in
++++ b/src/sbd.sysconfig.in
+@@ -114,9 +114,14 @@ SBD_MOVE_TO_ROOT_CGROUP=auto
+ # On shutdown pacemakerd is going to wait in a state where it
+ # has cleanly shutdown resources till sbd fetches that state.
+ #
+-# Default is 'no' to prevent pacemaker from waiting for a
+-# ping that will never come when working together with an sbd
+-# version that doesn't support the feature.
++# The default is set when building SBD and Pacemaker from source.
++# Going for 'no' is safer if it can't be assured that SBD and
++# Pacemaker installed do both support the synchronization feature.
++# When going with 'yes' - also using package dependencies to
++# assure SBD & Pacemaker both support the synchronization
++# feature and are assuming the same default - an SBD configuration
++# inherited via an upgrade doesn't have to be altered to still
++# benefit from the new feature.
+ #
+ SBD_SYNC_RESOURCE_STARTUP=@SBD_SYNC_RESOURCE_STARTUP_SYSCONFIG@
+ 
+-- 
+1.8.3.1
+

SPECS/sbd.spec

@@ -17,7 +17,7 @@
 #
 %global commit bfeee963f7363720da91a018045ca6746d822ba0
 %global github_owner Clusterlabs
-%global buildnum 1
+%global buildnum 2
 
 %ifarch s390x s390
 # minimum timeout on LPAR diag288 watchdog is 15s
@@ -37,6 +37,7 @@ Version:        1.4.2
 Release:        %{buildnum}%{?dist}
 Url:            https://github.com/%{github_owner}/%{name}
 Source0:        https://github.com/%{github_owner}/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
+Patch1:         0001-Doc-adapt-description-of-startup-shutdown-sync.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -162,6 +163,12 @@ fi
 %{_libdir}/libsbdtestbed*
 
 %changelog
+* Thu Jan 28 2021 Klaus Wenninger <kwenning@redhat.com> - 1.4.2-2
+- update SBD_SYNC_RESOURCE_STARTUP description for
+  configurable default
+
+  Resolves: rhbz#1915874
+
 * Thu Dec 3 2020 Klaus Wenninger <kwenning@redhat.com> - 1.4.2-1
 - rebase to upstream v1.4.2
 - make sbd default to do pacemakerd-api handshake