import OL resource-agents-4.10.0-71.el9_6.6

This commit is contained in:
Andrew Lukoshko 2025-08-07 11:12:15 +00:00
parent 37e6ecace5
commit a451362f03
2 changed files with 33 additions and 1 deletions

View File

@ -0,0 +1,25 @@
From 9127148e15fc200356df2571c7c9e5a716854c24 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
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() {

View File

@ -45,7 +45,7 @@
Name: resource-agents Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 4.10.0 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+ License: GPLv2+ and LGPLv2+
URL: https://github.com/ClusterLabs/resource-agents URL: https://github.com/ClusterLabs/resource-agents
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz 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 Patch107: RHEL-88429-1-podman-etcd-new-ra.patch
Patch108: RHEL-88429-2-podman-etcd-remove-unused-actions-from-metadata.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 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 # bundled ha-cloud-support libs
Patch500: ha-cloud-support-aliyun.patch Patch500: ha-cloud-support-aliyun.patch
@ -380,6 +381,7 @@ exit 1
%patch -p1 -P 107 %patch -p1 -P 107
%patch -p1 -P 108 %patch -p1 -P 108
%patch -p1 -P 109 %patch -p1 -P 109
%patch -p1 -P 110
# bundled ha-cloud-support libs # bundled ha-cloud-support libs
%patch -p1 -P 500 %patch -p1 -P 500
@ -709,6 +711,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
%changelog %changelog
* Tue Aug 05 2025 Alan Steinberg <alan.steinberg@oracle.com> - 4.10.0-71.6
- Filesystem: fix issue with Vormetric mounts
Resolves: RHEL-101705
* Mon Apr 28 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-71.5 * Mon Apr 28 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-71.5
- podman-etcd: new resource agent - podman-etcd: new resource agent
- Filesystem: add support for aznfs - Filesystem: add support for aznfs