From d78bf2ed3ed8022727824b21c41d44c2d30e574d Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Fri, 13 May 2016 20:24:52 +1000 Subject: [PATCH] ctdb-scripts: Rename get_iface_ip_maskbits_family() to get_iface_ip_maskbits() The family is not needed. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/config/events.d/10.interface | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ctdb/config/events.d/10.interface b/ctdb/config/events.d/10.interface index fc9097b84e6..bdb94430a06 100755 --- a/ctdb/config/events.d/10.interface +++ b/ctdb/config/events.d/10.interface @@ -74,8 +74,8 @@ monitor_interfaces() return 0 } -# Sets: iface, ip, maskbits, family -get_iface_ip_maskbits_family () +# Sets: iface, ip, maskbits +get_iface_ip_maskbits () { _iface_in="$1" ip="$2" @@ -85,7 +85,6 @@ get_iface_ip_maskbits_family () if [ -n "$1" ] ; then maskbits="$1" iface="$2" - family="$3" if [ "$iface" != "$_iface_in" ] ; then printf \ @@ -183,7 +182,7 @@ case "$1" in # 3) remove the IP from the interface # 4) remove the firewall rule shift - get_iface_ip_maskbits_family "$@" + get_iface_ip_maskbits "$@" ip_block "$ip" "$iface" @@ -216,7 +215,7 @@ case "$1" in _ip=$4 _maskbits=$5 - get_iface_ip_maskbits_family "$_oiface" "$_ip" "$_maskbits" + get_iface_ip_maskbits "$_oiface" "$_ip" "$_maskbits" oiface="$iface" ip_block "$ip" "$oiface" -- 2.47.3