diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-02-22 18:48:23 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2018-03-01 19:39:14 +0100 |
| commit | c8dfd4fe5a5ef8a368406d2afef58cbf8f162ca5 (patch) | |
| tree | 56babd0eb84d29d2f4479a6eb43bccce62723589 /ctdb | |
| parent | 0519c513adc7c6f024c50facfb8a963fedd3e1b7 (diff) | |
| download | samba-c8dfd4fe5a5ef8a368406d2afef58cbf8f162ca5.tar.gz | |
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 <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb')
| -rwxr-xr-x | ctdb/config/events.d/13.per_ip_routing | 2 | ||||
| -rwxr-xr-x | 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 () |