From 402c07e0ebda409e9b63f5df4b5f6a5600bfa19b Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Wed, 3 Mar 2021 13:44:48 +0100
Subject: [PATCH] - Filesystem: change force_unmount default to safe for RHEL9+

  Resolves: rhbz#1843578
---
 bz1843578-Filesystem-force_unmount-safe.patch | 39 +++++++++++++++++++
 resource-agents.spec                          |  8 +++-
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 bz1843578-Filesystem-force_unmount-safe.patch

diff --git a/bz1843578-Filesystem-force_unmount-safe.patch b/bz1843578-Filesystem-force_unmount-safe.patch
new file mode 100644
index 0000000..e4dc4de
--- /dev/null
+++ b/bz1843578-Filesystem-force_unmount-safe.patch
@@ -0,0 +1,39 @@
+From b792a143fc90468f8911243a5ea77c0c424bd624 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Tue, 2 Mar 2021 11:17:36 +0100
+Subject: [PATCH] Filesystem: change force_unmount default to safe for RHEL9+
+
+---
+ heartbeat/Filesystem | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
+index 90e22dae6..48d58e1d5 100755
+--- a/heartbeat/Filesystem
++++ b/heartbeat/Filesystem
+@@ -68,21 +68,21 @@ OCF_RESKEY_fstype_default=""
+ OCF_RESKEY_options_default=""
+ OCF_RESKEY_statusfile_prefix_default="${DFLT_STATUSDIR}"
+ OCF_RESKEY_run_fsck_default="auto"
+-
+ OCF_RESKEY_fast_stop_default="no"
++OCF_RESKEY_force_clones_default="false"
++OCF_RESKEY_force_unmount_default="true"
+ 
+-# yes for RHEL/CentOS versions less than 9, otherwise no
++# RHEL9+ specific defaults
+ if is_redhat_based; then
+ 	get_os_ver
+ 	ocf_version_cmp "$VER" "9.0" 2>/dev/null
+ 
+ 	if [ "$?" -eq 0 ]; then
+ 		OCF_RESKEY_fast_stop_default="yes"
++		OCF_RESKEY_force_unmount_default="safe"
+ 	fi
+ fi
+ 
+-OCF_RESKEY_force_clones_default="false"
+-OCF_RESKEY_force_unmount_default="true"
+ 
+ : ${OCF_RESKEY_device=${OCF_RESKEY_device_default}}
+ : ${OCF_RESKEY_directory=${OCF_RESKEY_directory_default}}
diff --git a/resource-agents.spec b/resource-agents.spec
index 2c96a42..ddf9469 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -45,11 +45,12 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.7.0
-Release:	5%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	6%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPLv2+ and LGPLv2+
 URL:		https://github.com/ClusterLabs/resource-agents
 Source0:	%{upstream_prefix}-%{upstream_version}.tar.gz
 Patch0:		ha-cloud-support-aws.patch
+Patch1:		bz1843578-Filesystem-force_unmount-safe.patch
 
 Obsoletes:	heartbeat-resources <= %{version}
 Provides:	heartbeat-resources = %{version}
@@ -401,6 +402,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 
 
 %changelog
+* Wed Mar  3 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.7.0-6
+- Filesystem: change force_unmount default to safe for RHEL9+
+
+  Resolves: rhbz#1843578
+
 * Wed Mar  3 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.7.0-5
 - Exclude unsupported agents