- 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

  Resolves: RHEL-109485
This commit is contained in:
Oyvind Albrigtsen 2025-10-31 14:42:19 +01:00
parent fbd754c234
commit e190be112c
3 changed files with 29 additions and 3 deletions

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

View File

@ -45,7 +45,7 @@
Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 4.10.0
Release: 93%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
Release: 94%{?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
@ -181,7 +181,8 @@ Patch128: RHEL-123906-podman-etcd-compute-dynamic-revision-bump-from-maxRaftInde
Patch129: RHEL-115785-RHEL-115782-2-db2-fix-variable-name.patch
Patch130: RHEL-118621-MailTo-add-s-nail-support-for-multiple-recipients.patch
Patch131: RHEL-64949-oracle-improve-monpassword-description.patch
Patch132: RHEL-109485-nfsserver-support-non-clustered-kerberized-mounts.patch
Patch132: RHEL-109485-1-nfsserver-support-non-clustered-kerberized-mounts.patch
Patch133: RHEL-109485-2-nfsserver-fix-error-message.patch
# bundled ha-cloud-support libs
Patch500: ha-cloud-support-aliyun.patch
@ -459,6 +460,7 @@ exit 1
%patch -p1 -P 130
%patch -p1 -P 131
%patch -p1 -P 132
%patch -p1 -P 133
# bundled ha-cloud-support libs
%patch -p1 -P 500
@ -791,7 +793,7 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
%changelog
* Fri Oct 31 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-93
* Fri Oct 31 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-94
- 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