rpms/resource-agents
6
0
Fork 0
Code Issues Pull Requests Releases Activity

- nfsserver: add ability to set e.g. "pipefs-directory=/run/nfs/rpc_pipefs"

Browse Source 
in /etc/nfs.conf to avoid issues with non-clustered Kerberized mounts

  Resolves: RHEL-109486
This commit is contained in:
Oyvind Albrigtsen 2025-10-31 12:34:46 +01:00
parent cb460115e2
commit 2fd73ee0da
3 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
RHEL-109486-nfsserver-support-non-clustered-kerberized-mounts.patch → RHEL-109486-1-nfsserver-support-non-clustered-kerberized-mounts.patch
View File

24
RHEL-109486-2-nfsserver-fix-error-message.patch Normal file
View File

@ -0,0 +1,24 @@
From 72620db5b52c943358faaf77ce5a15fb41169fab Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Fri, 31 Oct 2025 11:22:46 +0100
Subject: [PATCH] nfsserver: set systemd_running before nfsserver_validate() to
avoid error message
---
heartbeat/nfsserver | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/heartbeat/nfsserver b/heartbeat/nfsserver
index 83f4bac51..71a711305 100755
--- a/heartbeat/nfsserver
+++ b/heartbeat/nfsserver
@@ -1062,8 +1062,8 @@ nfsserver_validate ()
return $OCF_SUCCESS
}
-nfsserver_validate
systemd_is_running; systemd_running=$?
+nfsserver_validate
case $__OCF_ACTION in
start) nfsserver_start

8
resource-agents.spec
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.16.0 Version: 4.16.0
Release: 36%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} Release: 37%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
License: GPL-2.0-or-later AND LGPL-2.1-or-later License: GPL-2.0-or-later AND LGPL-2.1-or-later
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
@ -96,7 +96,8 @@ Patch43: RHEL-124206-podman-etcd-compute-dynamic-revision-bump-from-maxRaftIndex
Patch44: RHEL-102255-RHEL-102319-2-db2-fix-variable-name.patch Patch44: RHEL-102255-RHEL-102319-2-db2-fix-variable-name.patch
Patch45: RHEL-92707-MailTo-add-s-nail-support-for-multiple-recipients.patch Patch45: RHEL-92707-MailTo-add-s-nail-support-for-multiple-recipients.patch
Patch46: RHEL-124881-oracle-improve-monpassword-description.patch Patch46: RHEL-124881-oracle-improve-monpassword-description.patch
Patch47: RHEL-109486-nfsserver-support-non-clustered-kerberized-mounts.patch Patch47: RHEL-109486-1-nfsserver-support-non-clustered-kerberized-mounts.patch
Patch48: RHEL-109486-2-nfsserver-fix-error-message.patch
# bundled ha-cloud-support libs # bundled ha-cloud-support libs
Patch500: ha-cloud-support-aliyun.patch Patch500: ha-cloud-support-aliyun.patch
@ -315,6 +316,7 @@ exit 1
%patch -p1 -P 45 %patch -p1 -P 45
%patch -p1 -P 46 %patch -p1 -P 46
%patch -p1 -P 47 %patch -p1 -P 47
%patch -p1 -P 48
# bundled ha-cloud-support libs # bundled ha-cloud-support libs
%patch -p1 -P 500 %patch -p1 -P 500
@ -647,7 +649,7 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
%changelog %changelog
* Fri Oct 31 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-36 * Fri Oct 31 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-37
- nfsserver: add ability to set e.g. "pipefs-directory=/run/nfs/rpc_pipefs" - nfsserver: add ability to set e.g. "pipefs-directory=/run/nfs/rpc_pipefs"
in /etc/nfs.conf to avoid issues with non-clustered Kerberized mounts in /etc/nfs.conf to avoid issues with non-clustered Kerberized mounts