From a451362f0337d092a182d05a424e7c938707d72f Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Thu, 7 Aug 2025 11:12:15 +0000 Subject: [PATCH] import OL resource-agents-4.10.0-71.el9_6.6 --- ...stem-fix-issue-with-Vormetric-mounts.patch | 25 +++++++++++++++++++ SPECS/resource-agents.spec | 9 ++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 SOURCES/RHEL-101705-Filesystem-fix-issue-with-Vormetric-mounts.patch diff --git a/SOURCES/RHEL-101705-Filesystem-fix-issue-with-Vormetric-mounts.patch b/SOURCES/RHEL-101705-Filesystem-fix-issue-with-Vormetric-mounts.patch new file mode 100644 index 0000000..e27ffc8 --- /dev/null +++ b/SOURCES/RHEL-101705-Filesystem-fix-issue-with-Vormetric-mounts.patch @@ -0,0 +1,25 @@ +From 9127148e15fc200356df2571c7c9e5a716854c24 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Thu, 26 Jun 2025 09:39:31 +0200 +Subject: [PATCH] Filesystem: fix issue with Vormetric mounts + +--- + heartbeat/Filesystem | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem +index d10e5a714..515a3919d 100755 +--- a/heartbeat/Filesystem ++++ b/heartbeat/Filesystem +@@ -361,8 +361,8 @@ list_mounts() { + fi + done + +- # Convert octal \040 to space characters +- printf "$mount_list" ++ # Convert octal \040 to space characters and ignore Vormetric mounts ++ printf "$mount_list" | grep -v "secfs2$" + } + + determine_blockdevice() { + diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec index b08aa8a..cf9ec57 100644 --- a/SPECS/resource-agents.spec +++ b/SPECS/resource-agents.spec @@ -45,7 +45,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.10.0 -Release: 71%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.5 +Release: 71%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.6 License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/resource-agents Source0: %{upstream_prefix}-%{upstream_version}.tar.gz @@ -153,6 +153,7 @@ Patch106: RHEL-88035-Filesystem-add-support-for-aznfs.patch Patch107: RHEL-88429-1-podman-etcd-new-ra.patch Patch108: RHEL-88429-2-podman-etcd-remove-unused-actions-from-metadata.patch Patch109: RHEL-88429-3-podman-etcd-fix-listen-peer-urls-binding.patch +Patch110: RHEL-101705-Filesystem-fix-issue-with-Vormetric-mounts.patch # bundled ha-cloud-support libs Patch500: ha-cloud-support-aliyun.patch @@ -380,6 +381,7 @@ exit 1 %patch -p1 -P 107 %patch -p1 -P 108 %patch -p1 -P 109 +%patch -p1 -P 110 # bundled ha-cloud-support libs %patch -p1 -P 500 @@ -709,6 +711,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog +* Tue Aug 05 2025 Alan Steinberg - 4.10.0-71.6 +- Filesystem: fix issue with Vormetric mounts + + Resolves: RHEL-101705 + * Mon Apr 28 2025 Oyvind Albrigtsen - 4.10.0-71.5 - podman-etcd: new resource agent - Filesystem: add support for aznfs