diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-11-20 14:32:46 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2014-12-05 21:02:39 +0100 |
| commit | 4940f191d37b5deadc8b1edf0cd516674e5d5d64 (patch) | |
| tree | 30f80af0de414c3f468c3a8b0f7988371a1d087c /ctdb/tests/eventscripts/scripts | |
| parent | 7428f809a76044fcbc98fd5f718e331ce183941d (diff) | |
| download | samba-4940f191d37b5deadc8b1edf0cd516674e5d5d64.tar.gz samba-4940f191d37b5deadc8b1edf0cd516674e5d5d64.tar.xz samba-4940f191d37b5deadc8b1edf0cd516674e5d5d64.zip | |
ctdb-scripts: Update eventscripts to use ctdb -X instead of ctdb -Y
Also update associated eventscript unit tests and ctdb stub.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/tests/eventscripts/scripts')
| -rw-r--r-- | ctdb/tests/eventscripts/scripts/local.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh index cea6c4daf8..23a64815c9 100644 --- a/ctdb/tests/eventscripts/scripts/local.sh +++ b/ctdb/tests/eventscripts/scripts/local.sh @@ -355,7 +355,7 @@ Swap: 5719 246 5473" ctdb_get_interfaces () { # The echo/subshell forces all the output onto 1 line. - echo $(ctdb ifaces -Y | awk -F: 'FNR > 1 {print $2}') + echo $(ctdb ifaces -X | awk -F'|' 'FNR > 1 {print $2}') } ctdb_get_1_interface () @@ -378,10 +378,10 @@ ctdb_get_all_public_addresses () # Each line is suitable for passing to takeip/releaseip ctdb_get_my_public_addresses () { - ctdb ip -v -Y | { + ctdb ip -v -X | { read _x # skip header line - while IFS=":" read _x _ip _x _iface _x ; do + while IFS="|" read _x _ip _x _iface _x ; do [ -n "$_iface" ] || continue while IFS="/$IFS" read _i _maskbits _x ; do if [ "$_ip" = "$_i" ] ; then |