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

- ocf-shellfuncs: fix syntax error in crm_mon_no_validation()

Browse Source 
Resolves: RHEL-73689
This commit is contained in:
Oyvind Albrigtsen 2025-01-24 12:00:04 +01:00
parent 4cc212f304
commit ad7d614c15
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
RHEL-73689-ocf-shellfuncs-fix-syntax-error-in-crm_mon_no_validation.patch Normal file
View File

@ -0,0 +1,23 @@
From 17bf880b110c59a69e677b3961b0ebe4e9a483d9 Mon Sep 17 00:00:00 2001
From: Sergey Safarov <s.safarov@anycast-lb.net>
Date: Sun, 12 Jan 2025 20:02:53 +0200
Subject: [PATCH] ocf-shellfuncs: fixed bash systax error added at
a25f08cf98d784894df9c52960eff5ccef059393
---
heartbeat/ocf-shellfuncs.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/heartbeat/ocf-shellfuncs.in b/heartbeat/ocf-shellfuncs.in
index 8e51fa3c8..6b35b89c7 100644
--- a/heartbeat/ocf-shellfuncs.in
+++ b/heartbeat/ocf-shellfuncs.in
@@ -742,7 +742,7 @@ crm_mon_no_validation()
# The subshell prevents parsing error with incompatible shells
ocf_version_cmp "$OCF_RESKEY_crm_feature_set" "3.19.7"
if [ $res -eq 2 ] || [ $res -eq 1 ]; then
- "$SHELL" -c "CIB_file=<(${HA_SBIN_DIR}/cibadmin -Q \
+ "$SHELL" -c "CIB_file=<(${HA_SBIN_DIR}/cibadmin -Q) \
${HA_SBIN_DIR}/crm_mon \$*" -- $*
else
"$SHELL" -c "CIB_file=<(${HA_SBIN_DIR}/cibadmin -Q | sed 's/validate-with=\"[^\"]*\"/validate-with=\"none\"/') \

9
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: 4%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} Release: 5%{?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
@ -62,6 +62,7 @@ Patch9: RHEL-76037-1-storage-mon-remove-unused-variables.patch
Patch10: RHEL-76037-2-storage-mon-fix-daemon-mode-bug-that-caused-delayed-initial-score.patch Patch10: RHEL-76037-2-storage-mon-fix-daemon-mode-bug-that-caused-delayed-initial-score.patch
Patch11: RHEL-76037-3-storage-mon-only-use-underscores-in-functions.patch Patch11: RHEL-76037-3-storage-mon-only-use-underscores-in-functions.patch
Patch12: RHEL-76037-4-storage-mon-check-if-daemon-is-already-running.patch Patch12: RHEL-76037-4-storage-mon-check-if-daemon-is-already-running.patch
Patch13: RHEL-73689-ocf-shellfuncs-fix-syntax-error-in-crm_mon_no_validation.patch
# bundled ha-cloud-support libs # bundled ha-cloud-support libs
Patch500: ha-cloud-support-aliyun.patch Patch500: ha-cloud-support-aliyun.patch
@ -231,6 +232,7 @@ exit 1
%patch -p1 -P 10 %patch -p1 -P 10
%patch -p1 -P 11 %patch -p1 -P 11
%patch -p1 -P 12 %patch -p1 -P 12
%patch -p1 -P 13
# bundled ha-cloud-support libs # bundled ha-cloud-support libs
%patch -p1 -P 500 %patch -p1 -P 500
@ -549,6 +551,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
* Fri Jan 24 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-5
- ocf-shellfuncs: fix syntax error in crm_mon_no_validation()
Resolves: RHEL-73689
* Fri Jan 24 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-4 * Fri Jan 24 2025 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.16.0-4
- storage-mon: fix daemon mode bug that caused delayed initial score - storage-mon: fix daemon mode bug that caused delayed initial score