From c8dfd4fe5a5ef8a368406d2afef58cbf8f162ca5 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Thu, 22 Feb 2018 18:48:23 +1100 Subject: [PATCH] ctdb-scripts: Add default for public addresses file where missing This makes it consistent with the rest of the script code. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/config/events.d/13.per_ip_routing | 2 +- ctdb/config/functions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ctdb/config/events.d/13.per_ip_routing b/ctdb/config/events.d/13.per_ip_routing index d8e02475dff..191d947264d 100755 --- a/ctdb/config/events.d/13.per_ip_routing +++ b/ctdb/config/events.d/13.per_ip_routing @@ -207,7 +207,7 @@ get_config_for_ip () if [ "$_ip" = "$_i" ] ; then printf "%s" "$_ip "; ipv4_host_addr_to_net "$_ip" "$_maskbits" fi - done <"${CTDB_PUBLIC_ADDRESSES:-/dev/null}" + done <"${CTDB_PUBLIC_ADDRESSES:-${CTDB_BASE}/public_addresses}" else while read _i _rest ; do if [ "$_ip" = "$_i" ] ; then diff --git a/ctdb/config/functions b/ctdb/config/functions index 3805d480326..68149c6399e 100755 --- a/ctdb/config/functions +++ b/ctdb/config/functions @@ -592,7 +592,7 @@ drop_all_public_ips () # shellcheck disable=SC2034 while read _ip _x ; do drop_ip "$_ip" - done <"${CTDB_PUBLIC_ADDRESSES:-/dev/null}" + done <"${CTDB_PUBLIC_ADDRESSES:-${CTDB_BASE}/public_addresses}" } flush_route_cache () -- 2.47.3