Low: IPaddr2: Remove stray backslash

This commit is contained in:
bizhiyuan 2024-03-01 15:47:57 +08:00
parent 11064daaa6
commit 96ca928fda
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,33 @@
From a0b09687b6b26331fe6ec20915a122dcb7034aaa Mon Sep 17 00:00:00 2001
From: Reid Wahl <nrwahl@protonmail.com>
Date: Sun, 10 Dec 2023 12:11:41 -0800
Subject: [PATCH] Low: IPaddr2: Remove stray backslash
Fixes this warning (which gets logged on every recurring monitor for a
Pacemaker resource):
$ OCF_ROOT=/usr/lib/ocf OCF_RESKEY_ip=192.168.22.41 \
/usr/lib/ocf/resource.d/heartbeat/IPaddr2 monitor
grep: warning: stray \ before white space
Signed-off-by: Reid Wahl <nrwahl@protonmail.com>
---
heartbeat/IPaddr2 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2
index 97a7431a..5f30b8f9 100755
--- a/heartbeat/IPaddr2
+++ b/heartbeat/IPaddr2
@@ -624,7 +624,7 @@ find_interface() {
# List interfaces but exclude FreeS/WAN ipsecN virtual interfaces
#
local iface="`$IP2UTIL -o -f $FAMILY addr show \
- | grep "\ $ipaddr/$netmask" \
+ | grep " $ipaddr/$netmask" \
| cut -d ' ' -f2 \
| grep -v '^ipsec[0-9][0-9]*$'`"
--
2.41.0

View File

@ -1,7 +1,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.13.0 Version: 4.13.0
Release: 8 Release: 9
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
@ -13,6 +13,7 @@ Patch0004: fix-uninitialized-value-covscan-error.patch
Patch0005: Avoid-false-positive-for-VG-activation.patch Patch0005: Avoid-false-positive-for-VG-activation.patch
Patch0006: Don-t-build-with-ansi-by-default.patch Patch0006: Don-t-build-with-ansi-by-default.patch
Patch0007: Fix-docker-RA-behavior-when-Docker-isn-t-running.patch Patch0007: Fix-docker-RA-behavior-when-Docker-isn-t-running.patch
Patch0008: Low-IPaddr2-Remove-stray-backslash.patch
Obsoletes: heartbeat-resources <= %{version} Obsoletes: heartbeat-resources <= %{version}
Provides: heartbeat-resources = %{version} Provides: heartbeat-resources = %{version}
@ -111,6 +112,9 @@ export CFLAGS="$(echo '%{optflags}')"
%{_mandir}/man8/{ocf-tester.8*,ldirectord.8*} %{_mandir}/man8/{ocf-tester.8*,ldirectord.8*}
%changelog %changelog
* Fri Mar 01 2024 bizhiyuan <bizhiyuan@kylinos.cn> - 4.13.0-9
- Low: IPaddr2: Remove stray backslash
* Fri Mar 01 2024 bizhiyuan <bizhiyuan@kylinos.cn> - 4.13.0-8 * Fri Mar 01 2024 bizhiyuan <bizhiyuan@kylinos.cn> - 4.13.0-8
- Fix docker RA behavior when Docker is not running - Fix docker RA behavior when Docker is not running