!17 Fix loopback handling
From: @bixiaoyan1 Reviewed-by: @jxy_git Signed-off-by: @jxy_git
This commit is contained in:
commit
ee520c0a01
38
fix-loopback-handling.patch
Normal file
38
fix-loopback-handling.patch
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
From 995641ec973ac2791eceeddc84c21cfc20cb28d5 Mon Sep 17 00:00:00 2001
|
||||||
|
From: bixiaoyan <bixiaoyan@kylinos.cn>
|
||||||
|
Date: Tue, 7 Nov 2023 15:08:31 +0800
|
||||||
|
Subject: [PATCH] fix loopback handling
|
||||||
|
|
||||||
|
---
|
||||||
|
heartbeat/findif.sh | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/heartbeat/findif.sh b/heartbeat/findif.sh
|
||||||
|
index 5f1c19e..7c766e6 100644
|
||||||
|
--- a/heartbeat/findif.sh
|
||||||
|
+++ b/heartbeat/findif.sh
|
||||||
|
@@ -29,10 +29,10 @@ prefixcheck() {
|
||||||
|
fi
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
-getnetworkinfo()
|
||||||
|
+getloopbackinfo()
|
||||||
|
{
|
||||||
|
local line netinfo
|
||||||
|
- ip -o -f inet route list match $OCF_RESKEY_ip scope host | (while read line;
|
||||||
|
+ ip -o -f inet route list match $OCF_RESKEY_ip table local scope host | (while read line;
|
||||||
|
do
|
||||||
|
netinfo=`echo $line | awk '{print $2}'`
|
||||||
|
case $netinfo in
|
||||||
|
@@ -222,7 +222,7 @@ findif()
|
||||||
|
if [ $# = 0 ] ; then
|
||||||
|
case $OCF_RESKEY_ip in
|
||||||
|
127.*)
|
||||||
|
- set -- `getnetworkinfo`
|
||||||
|
+ set -- `getloopbackinfo`
|
||||||
|
shift;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
@ -1,12 +1,13 @@
|
|||||||
Name: resource-agents
|
Name: resource-agents
|
||||||
Summary: Open Source HA Reusable Cluster Resource Scripts
|
Summary: Open Source HA Reusable Cluster Resource Scripts
|
||||||
Version: 4.13.0
|
Version: 4.13.0
|
||||||
Release: 2
|
Release: 3
|
||||||
License: GPLv2+ and LGPLv2+
|
License: GPLv2+ and LGPLv2+
|
||||||
URL: https://github.com/ClusterLabs/resource-agents
|
URL: https://github.com/ClusterLabs/resource-agents
|
||||||
Source0: https://github.com/ClusterLabs/resource-agents/archive/v%{version}.tar.gz
|
Source0: https://github.com/ClusterLabs/resource-agents/archive/v%{version}.tar.gz
|
||||||
Patch0000: fix-failed-to-parse-pid-from-pid-file.patch
|
Patch0000: fix-failed-to-parse-pid-from-pid-file.patch
|
||||||
Patch0001: Fix-PRIMARY_IFACE-variable.patch
|
Patch0001: Fix-PRIMARY_IFACE-variable.patch
|
||||||
|
Patch0002: fix-loopback-handling.patch
|
||||||
Obsoletes: heartbeat-resources <= %{version}
|
Obsoletes: heartbeat-resources <= %{version}
|
||||||
Provides: heartbeat-resources = %{version}
|
Provides: heartbeat-resources = %{version}
|
||||||
BuildRequires: automake autoconf pkgconfig gcc perl-interpreter perl-generators python3-devel
|
BuildRequires: automake autoconf pkgconfig gcc perl-interpreter perl-generators python3-devel
|
||||||
@ -104,6 +105,9 @@ export CFLAGS="$(echo '%{optflags}')"
|
|||||||
%{_mandir}/man8/{ocf-tester.8*,ldirectord.8*}
|
%{_mandir}/man8/{ocf-tester.8*,ldirectord.8*}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Nov 7 2023 bixiaoyan <bixiaoyan@kylinos.cn> - 4.13.0-3
|
||||||
|
- Fix loopback handling
|
||||||
|
|
||||||
* Fri Oct 27 2023 zouzhimin <zouzhimin@kylinos.cn> - 4.13.0-2
|
* Fri Oct 27 2023 zouzhimin <zouzhimin@kylinos.cn> - 4.13.0-2
|
||||||
- Fix PRIMARY_IFACE variable
|
- Fix PRIMARY_IFACE variable
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user