Blame SOURCES/findif-only-match-lines-with-netmasks.patch
|
 |
b94b9d |
From 2437d3879270f8febc5353e09898dd7d0aee08af Mon Sep 17 00:00:00 2001
|
|
|
b94b9d |
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
|
|
b94b9d |
Date: Wed, 1 Aug 2018 09:54:39 +0200
|
|
|
b94b9d |
Subject: [PATCH] findif: only match lines containing netmasks
|
|
|
b94b9d |
|
|
|
b94b9d |
---
|
|
|
b94b9d |
heartbeat/findif.sh | 4 ++--
|
|
|
b94b9d |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
b94b9d |
|
|
|
b94b9d |
diff --git a/heartbeat/findif.sh b/heartbeat/findif.sh
|
|
|
b94b9d |
index fc84cf0ec..66bc6d56a 100644
|
|
|
b94b9d |
--- a/heartbeat/findif.sh
|
|
|
b94b9d |
+++ b/heartbeat/findif.sh
|
|
|
b94b9d |
@@ -215,9 +215,9 @@ findif()
|
|
|
b94b9d |
fi
|
|
|
b94b9d |
if [ -n "$nic" ] ; then
|
|
|
b94b9d |
# NIC supports more than two.
|
|
|
b94b9d |
- set -- $(ip -o -f $family route list match $match $scope | grep "dev $nic " | awk 'BEGIN{best=0} { mask=$1; sub(".*/", "", mask); if( int(mask)>=best ) { best=int(mask); best_ln=$0; } } END{print best_ln}')
|
|
|
b94b9d |
+ set -- $(ip -o -f $family route list match $match $scope | grep "dev $nic " | awk 'BEGIN{best=0} /\// { mask=$1; sub(".*/", "", mask); if( int(mask)>=best ) { best=int(mask); best_ln=$0; } } END{print best_ln}')
|
|
|
b94b9d |
else
|
|
|
b94b9d |
- set -- $(ip -o -f $family route list match $match $scope | awk 'BEGIN{best=0} { mask=$1; sub(".*/", "", mask); if( int(mask)>=best ) { best=int(mask); best_ln=$0; } } END{print best_ln}')
|
|
|
b94b9d |
+ set -- $(ip -o -f $family route list match $match $scope | awk 'BEGIN{best=0} /\// { mask=$1; sub(".*/", "", mask); if( int(mask)>=best ) { best=int(mask); best_ln=$0; } } END{print best_ln}')
|
|
|
b94b9d |
fi
|
|
|
b94b9d |
if [ $# = 0 ] ; then
|
|
|
b94b9d |
case $OCF_RESKEY_ip in
|