ctdb-scripts: Simplify ip_maskbits_iface()
authorMartin Schwenke <martin@meltin.net>
Fri, 13 May 2016 15:06:38 +0000 (01:06 +1000)
committerMartin Schwenke <martins@samba.org>
Thu, 26 May 2016 06:04:29 +0000 (08:04 +0200)
This doesn't need to print the family.  Nothing uses it.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/config/functions

index c1316bd3c74e8c567fa3d6e053afdaa336e9c3c6..33efa517e0bd975bf7c5e230f94094c602201377 100755 (executable)
@@ -608,16 +608,15 @@ ip_maskbits_iface ()
     _addr="$1"
 
     case "$_addr" in
-       *:*) _family="inet6" ; _bits=128 ;;
-       *)   _family="inet"  ; _bits=32  ;;
+       *:*) _bits=128 ;;
+       *)   _bits=32  ;;
     esac
 
     ip addr show to "${_addr}/${_bits}" 2>/dev/null | \
-       awk -v family="${_family}" \
-           'NR == 1 { iface = $2; sub(":$", "", iface) ; \
+       awk 'NR == 1 { iface = $2; sub(":$", "", iface) ; \
                       sub("@.*", "", iface) } \
              $1 ~ /inet/ { mask = $2; sub(".*/", "", mask); \
-                           print mask, iface, family }'
+                           print mask, iface }'
 }
 
 drop_ip ()