import Oracle_OSS resource-agents-4.9.0-54.el8_10.35
This commit is contained in:
AlmaLinux RelEng Bot
parent
5be79506ef
commit
428d79870b
@ -0,0 +1,33 @@
|
||||
From f671a00108d0b272493b4b4a0a5fb838e5eca2af Mon Sep 17 00:00:00 2001
|
||||
From: Silvan Raijer <s.raijer@rayzilt.nl>
|
||||
Date: Wed, 27 May 2026 11:10:19 +0200
|
||||
Subject: [PATCH] nfsserver: Stop fsidd when stopping nfs-server
|
||||
|
||||
Signed-off-by: Silvan Raijer <s.raijer@rayzilt.nl>
|
||||
---
|
||||
heartbeat/nfsserver | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/heartbeat/nfsserver b/heartbeat/nfsserver
|
||||
index fe15abc06..f41ef92c0 100755
|
||||
--- a/heartbeat/nfsserver
|
||||
+++ b/heartbeat/nfsserver
|
||||
@@ -1010,6 +1010,18 @@ nfsserver_stop ()
|
||||
return $OCF_ERR_GENERIC
|
||||
fi
|
||||
fi
|
||||
+
|
||||
+ nfs_exec stop fsidd > /dev/null 2>&1
|
||||
+ ocf_log info "Stop: fsidd"
|
||||
+ fn=`mktemp`
|
||||
+ nfs_exec status fsidd > $fn 2>&1
|
||||
+ rc=$?
|
||||
+ ocf_log debug "$(cat $fn)"
|
||||
+ rm -f $fn
|
||||
+ if [ "$rc" -eq "0" ]; then
|
||||
+ ocf_exit_reason "Failed to stop fsidd"
|
||||
+ return $OCF_ERR_GENERIC
|
||||
+ fi
|
||||
esac
|
||||
|
||||
|
||||
@ -0,0 +1,43 @@
|
||||
From ba7d5d59308458e1892fd29c9a719c8779dd46b6 Mon Sep 17 00:00:00 2001
|
||||
From: Arslan Ahmad <arslan.ahmad97@googlemail.com>
|
||||
Date: Tue, 2 Jun 2026 18:10:11 +0530
|
||||
Subject: [PATCH] nfsserver: Fixes the incorrect indentation
|
||||
|
||||
Signed-off-by: Arslan Ahmad <arslan.ahmad97@googlemail.com>
|
||||
---
|
||||
heartbeat/nfsserver | 22 +++++++++++-----------
|
||||
1 file changed, 11 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/heartbeat/nfsserver b/heartbeat/nfsserver
|
||||
index f41ef92c0..93428bfd1 100755
|
||||
--- a/heartbeat/nfsserver
|
||||
+++ b/heartbeat/nfsserver
|
||||
@@ -1011,17 +1011,17 @@ nfsserver_stop ()
|
||||
fi
|
||||
fi
|
||||
|
||||
- nfs_exec stop fsidd > /dev/null 2>&1
|
||||
- ocf_log info "Stop: fsidd"
|
||||
- fn=`mktemp`
|
||||
- nfs_exec status fsidd > $fn 2>&1
|
||||
- rc=$?
|
||||
- ocf_log debug "$(cat $fn)"
|
||||
- rm -f $fn
|
||||
- if [ "$rc" -eq "0" ]; then
|
||||
- ocf_exit_reason "Failed to stop fsidd"
|
||||
- return $OCF_ERR_GENERIC
|
||||
- fi
|
||||
+ nfs_exec stop fsidd > /dev/null 2>&1
|
||||
+ ocf_log info "Stop: fsidd"
|
||||
+ fn=`mktemp`
|
||||
+ nfs_exec status fsidd > $fn 2>&1
|
||||
+ rc=$?
|
||||
+ ocf_log debug "$(cat $fn)"
|
||||
+ rm -f $fn
|
||||
+ if [ "$rc" -eq "0" ]; then
|
||||
+ ocf_exit_reason "Failed to stop fsidd"
|
||||
+ return $OCF_ERR_GENERIC
|
||||
+ fi
|
||||
esac
|
||||
|
||||
|
||||
@ -0,0 +1,42 @@
|
||||
From 8000ba8d308a775c2cc8358ae2ef5b1b78b68221 Mon Sep 17 00:00:00 2001
|
||||
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
||||
Date: Wed, 10 Jun 2026 08:50:12 +0200
|
||||
Subject: [PATCH] nfsserver: dont try to stop fsidd when not present
|
||||
|
||||
---
|
||||
heartbeat/nfsserver | 22 ++++++++++++----------
|
||||
1 file changed, 12 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/heartbeat/nfsserver b/heartbeat/nfsserver
|
||||
index ab0710c48..ed916cac5 100755
|
||||
--- a/heartbeat/nfsserver
|
||||
+++ b/heartbeat/nfsserver
|
||||
@@ -1012,16 +1012,18 @@ nfsserver_stop ()
|
||||
fi
|
||||
fi
|
||||
|
||||
- nfs_exec stop fsidd > /dev/null 2>&1
|
||||
- ocf_log info "Stop: fsidd"
|
||||
- fn=`mktemp`
|
||||
- nfs_exec status fsidd > $fn 2>&1
|
||||
- rc=$?
|
||||
- ocf_log debug "$(cat $fn)"
|
||||
- rm -f $fn
|
||||
- if [ "$rc" -eq "0" ]; then
|
||||
- ocf_exit_reason "Failed to stop fsidd"
|
||||
- return $OCF_ERR_GENERIC
|
||||
+ if systemctl --no-legend list-unit-files "fsidd.service" | grep -q fsidd.service; then
|
||||
+ nfs_exec stop fsidd > /dev/null 2>&1
|
||||
+ ocf_log info "Stop: fsidd"
|
||||
+ fn=`mktemp`
|
||||
+ nfs_exec status fsidd > $fn 2>&1
|
||||
+ rc=$?
|
||||
+ ocf_log debug "$(cat $fn)"
|
||||
+ rm -f $fn
|
||||
+ if [ "$rc" -eq "0" ]; then
|
||||
+ ocf_exit_reason "Failed to stop fsidd"
|
||||
+ return $OCF_ERR_GENERIC
|
||||
+ fi
|
||||
fi
|
||||
esac
|
||||
|
||||
@ -73,7 +73,7 @@
|
||||
Name: resource-agents
|
||||
Summary: Open Source HA Reusable Cluster Resource Scripts
|
||||
Version: 4.9.0
|
||||
Release: 54%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.33
|
||||
Release: 54%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.35
|
||||
License: GPLv2+ and LGPLv2+
|
||||
URL: https://github.com/ClusterLabs/resource-agents
|
||||
%if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
|
||||
@ -185,6 +185,9 @@ Patch88: RHEL-152316-portblock-check-inverse-action.patch
|
||||
Patch89: RHEL-153157-db2-set-reintegration-when-promotion-is-successful.patch
|
||||
Patch90: RHEL-166181-1-db2-fix-bashism.patch
|
||||
Patch91: RHEL-166181-2-db2-do-not-use-db2stop-to-avoid-divergence-in-the-log.patch
|
||||
Patch92: RHEL-180766-1-nfsserver-fixes-unmount-failure-of-bind-mount-with-fsidd.patch
|
||||
Patch93: RHEL-180766-2-nfsserver-fixes-incorrect-indentation.patch
|
||||
Patch94: RHEL-180766-3-nfsserver-do-not-try-to-stop-fsidd-when-not-present.patch
|
||||
|
||||
# bundle patches
|
||||
Patch1000: 7-gcp-bundled.patch
|
||||
@ -466,6 +469,9 @@ exit 1
|
||||
%patch -p1 -P 89
|
||||
%patch -p1 -P 90
|
||||
%patch -p1 -P 91
|
||||
%patch -p1 -P 92
|
||||
%patch -p1 -P 93
|
||||
%patch -p1 -P 94
|
||||
|
||||
chmod 755 heartbeat/nova-compute-wait
|
||||
chmod 755 heartbeat/NovaEvacuate
|
||||
@ -1063,6 +1069,11 @@ ccs_update_schema > /dev/null 2>&1 ||:
|
||||
%{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
|
||||
|
||||
%changelog
|
||||
* Wed Jun 10 2026 Arslan Ahmad <arahmad@redhat.com> - 4.9.0-54.35
|
||||
- nfsserver: stop fsidd when stopping nfsserver
|
||||
|
||||
Resolves: RHEL-180766
|
||||
|
||||
* Tue Apr 28 2026 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.9.0-54.33
|
||||
- bundled pyasn1: fix CVE-2026-30922
|
||||
Resolves: RHEL-157190
|
||||
|
||||
Loading…
Reference in New Issue
Block a user