From e60d364ca6ff309ed53d96be24c2da1a38c2b25f Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Wed, 27 May 2026 10:52:43 +0200
Subject: [PATCH] - IPaddr2: fix interfaces named with keywords like primary,
 secondary,   etc

  Resolves: RHEL-179069
---
 ...2-fix-interfaces-named-with-keywords.patch | 24 +++++++++++++++++++
 resource-agents.spec                          | 10 +++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 RHEL-179069-IPaddr2-fix-interfaces-named-with-keywords.patch

diff --git a/RHEL-179069-IPaddr2-fix-interfaces-named-with-keywords.patch b/RHEL-179069-IPaddr2-fix-interfaces-named-with-keywords.patch
new file mode 100644
index 0000000..2067646
--- /dev/null
+++ b/RHEL-179069-IPaddr2-fix-interfaces-named-with-keywords.patch
@@ -0,0 +1,24 @@
+From b6527e11a9afaa2876f5c0ea9d4ecda0e4eea100 Mon Sep 17 00:00:00 2001
+From: Oyvind Albrigtsen <oalbrigt@redhat.com>
+Date: Tue, 19 May 2026 12:28:29 +0200
+Subject: [PATCH] IPaddr2: fix interfaces named with keywords like primary,
+ secondary, etc
+
+This can cause issues when another interface is in DOWN state.
+---
+ heartbeat/IPaddr2 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2
+index e9c1cdb74..462d8db5a 100755
+--- a/heartbeat/IPaddr2
++++ b/heartbeat/IPaddr2
+@@ -1028,7 +1028,7 @@ ip_served() {
+ 		return 0
+ 	fi
+ 
+-	if ocf_is_true "$OCF_RESKEY_check_link_status" && $IP2UTIL -f $FAMILY addr show $cur_nic | \
++	if ocf_is_true "$OCF_RESKEY_check_link_status" && $IP2UTIL -f $FAMILY addr show dev $cur_nic | \
+ 	    grep -q "[[:space:]]\(DOWN\|LOWERLAYERDOWN\)[[:space:]]"; then
+ 		echo "down"
+ 		return 0
diff --git a/resource-agents.spec b/resource-agents.spec
index e011dc3..2e3b1c4 100644
--- a/resource-agents.spec
+++ b/resource-agents.spec
@@ -45,7 +45,7 @@
 Name:		resource-agents
 Summary:	Open Source HA Reusable Cluster Resource Scripts
 Version:	4.10.0
-Release:	118%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
+Release:	119%{?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
@@ -213,6 +213,7 @@ Patch160:	RHEL-177850-podman-etcd-fix-port-2380-binding-race.patch
 Patch161:	RHEL-177840-podman-etcd-fix-machine-deletion-deadlock.patch
 Patch162:	RHEL-177845-podman-etcd-fix-learner-start-deadlock.patch
 Patch163:	RHEL-150842-pgsqlms-use-monitor_user-for-monitor-calls-and-use-pgpass-when-monitor_password-is-not-specified.patch
+Patch164:	RHEL-179069-IPaddr2-fix-interfaces-named-with-keywords.patch
 
 # bundled ha-cloud-support libs
 Patch500:	ha-cloud-support-aliyun.patch
@@ -521,6 +522,7 @@ exit 1
 %patch -p1 -P 161
 %patch -p1 -P 162
 %patch -p1 -P 163
+%patch -p1 -P 164
 
 # bundled ha-cloud-support libs
 %patch -p1 -P 500
@@ -855,6 +857,12 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm
 
 %changelog
+* Wed May 27 2026 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.10.0-119
+- IPaddr2: fix interfaces named with keywords like primary, secondary,
+  etc
+
+  Resolves: RHEL-179069
+
 * Mon May 25 2026 Arslan Ahmad <arahmad@redhat.com> - 4.10.0-118
 - pgsqlms: use monitor_user for monitor-calls and use .pgpass when
   monitor_password is not specified