From 347442e6adb62c468ea520e3e770396549dc0962 Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Thu, 29 Aug 2024 16:44:03 +0200 Subject: [PATCH] - IPsrcaddr: add IPv6 support Resolves: RHEL-32265 --- ...rcaddr-specify-dev-for-default-route.patch | 36 +++++++++++++++++++ resource-agents.spec | 16 +++++---- 2 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 RHEL-32265-5-IPsrcaddr-specify-dev-for-default-route.patch diff --git a/RHEL-32265-5-IPsrcaddr-specify-dev-for-default-route.patch b/RHEL-32265-5-IPsrcaddr-specify-dev-for-default-route.patch new file mode 100644 index 0000000..c94bd27 --- /dev/null +++ b/RHEL-32265-5-IPsrcaddr-specify-dev-for-default-route.patch @@ -0,0 +1,36 @@ +From f23ae9c1e9ff9a44a053c7c2378975ac5b807478 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Thu, 29 Aug 2024 16:24:02 +0200 +Subject: [PATCH] IPsrcaddr: specify dev for default route, as e.g. fe80:: + routes can be present on multiple interfaces + +--- + heartbeat/IPsrcaddr | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/heartbeat/IPsrcaddr b/heartbeat/IPsrcaddr +index 1c87d5b7f..58d89a280 100755 +--- a/heartbeat/IPsrcaddr ++++ b/heartbeat/IPsrcaddr +@@ -278,8 +278,8 @@ srca_start() { + errorexit "command 'ip route replace $TABLE $NETWORK dev $INTERFACE $PROTO src $1 $METRIC $PREF' failed" + + if [ "$OCF_RESKEY_destination" = "0.0.0.0/0" ] || [ "$OCF_RESKEY_destination" = "::/0" ]; then +- $CMDCHANGE $ROUTE_WO_SRC $PROTO src $1 || \ +- errorexit "command '$CMDCHANGE $ROUTE_WO_SRC $PROTO src $1' failed" ++ $CMDCHANGE $ROUTE_WO_SRC dev $INTERFACE $PROTO src $1 || \ ++ errorexit "command '$CMDCHANGE $ROUTE_WO_SRC dev $INTERFACE $PROTO src $1' failed" + fi + rc=$? + fi +@@ -322,8 +322,8 @@ srca_stop() { + errorexit "command 'ip route replace $TABLE $NETWORK dev $INTERFACE $OPTS $METRIC $PREF' failed" + + if [ "$OCF_RESKEY_destination" = "0.0.0.0/0" ] || [ "$OCF_RESKEY_destination" = "::/0" ]; then +- $CMDCHANGE $ROUTE_WO_SRC proto static || \ +- errorexit "command '$CMDCHANGE $ROUTE_WO_SRC proto static' failed" ++ $CMDCHANGE $ROUTE_WO_SRC dev $INTERFACE proto static || \ ++ errorexit "command '$CMDCHANGE $ROUTE_WO_SRC dev $INTERFACE proto static' failed" + fi + + return $? diff --git a/resource-agents.spec b/resource-agents.spec index 7b72243..5003460 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: 62%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 63%{?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 @@ -128,11 +128,12 @@ Patch75: RHEL-32265-1-findif.sh-fix-corner-cases.patch Patch76: RHEL-32265-2-IPsrcaddr-add-IPv6-support.patch Patch77: RHEL-32265-3-IPaddr2-only-set-metric-value-for-IPv6-when-detected.patch Patch78: RHEL-32265-4-findif.sh-ignore-unreachable-blackhole-prohibit-routes.patch -Patch79: RHEL-40393-Filesystem-1-dont-kill-unrelated-processes.patch -Patch80: RHEL-40393-Filesystem-2-update-bsd-logic.patch -Patch81: RHEL-32829-db2-fix-OCF_SUCESS-typo.patch -Patch82: RHEL-43579-galera-mysql-redis-remove-Unpromoted-monitor-action.patch -Patch83: RHEL-22715-LVM-activate-fix-false-positive.patch +Patch79: RHEL-32265-5-IPsrcaddr-specify-dev-for-default-route.patch +Patch80: RHEL-40393-Filesystem-1-dont-kill-unrelated-processes.patch +Patch81: RHEL-40393-Filesystem-2-update-bsd-logic.patch +Patch82: RHEL-32829-db2-fix-OCF_SUCESS-typo.patch +Patch83: RHEL-43579-galera-mysql-redis-remove-Unpromoted-monitor-action.patch +Patch84: RHEL-22715-LVM-activate-fix-false-positive.patch # bundled ha-cloud-support libs Patch500: ha-cloud-support-aws.patch @@ -340,6 +341,7 @@ exit 1 %patch -p1 -P 81 %patch -p1 -P 82 %patch -p1 -P 83 +%patch -p1 -P 84 # bundled ha-cloud-support libs %patch -p1 -P 500 @@ -661,7 +663,7 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog -* Mon Aug 19 2024 Oyvind Albrigtsen - 4.10.0-62 +* Thu Aug 29 2024 Oyvind Albrigtsen - 4.10.0-63 - IPsrcaddr: add IPv6 support Resolves: RHEL-32265