diff options
| author | Michael Adam <obnox@samba.org> | 2013-11-27 12:13:40 +0100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2013-11-28 07:31:12 +0100 |
| commit | 70f469e05e279e29980df2af10dd89c53001b236 (patch) | |
| tree | f50430a7a93e1247a35f4cccdfa92cb6b1811f2f /ctdb/tests | |
| parent | 90f79bf0737e8ad900d7cbf68edad977df55b4b6 (diff) | |
| download | samba-70f469e05e279e29980df2af10dd89c53001b236.tar.gz samba-70f469e05e279e29980df2af10dd89c53001b236.tar.xz samba-70f469e05e279e29980df2af10dd89c53001b236.zip | |
ctdb:tests: in the stub ip command, avoid broken pipe by using echo instead of cat
This fixes running "make autotest" from autobuild, since
it prevents irritating error output in delete_ip_from_iface()
when calling ip addr list ... | grep -Fq "inet ..." .
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/tests')
| -rwxr-xr-x | ctdb/tests/eventscripts/stubs/ip | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/ctdb/tests/eventscripts/stubs/ip b/ctdb/tests/eventscripts/stubs/ip index 053da750b9c..d4c9d8ab7dd 100755 --- a/ctdb/tests/eventscripts/stubs/ip +++ b/ctdb/tests/eventscripts/stubs/ip @@ -166,25 +166,19 @@ ip_addr_show () read local <"$pf" if [ -z "$_to" -o "${_to%/*}" = "${local%/*}" ] ; then calc_brd - cat <<EOF - inet ${local} brd ${brd} scope global ${dev} -EOF + echo " inet ${local} brd ${brd} scope global ${dev}" fi fi if $secondary && [ -r "$sf" ] ; then while read local ; do if [ -z "$_to" -o "${_to%/*}" = "${local%/*}" ] ; then calc_brd - cat <<EOF - inet ${local} brd ${brd} scope global secondary ${dev} -EOF + echo " inet ${local} brd ${brd} scope global secondary ${dev}" fi done <"$sf" fi if [ -z "$_to" ] ; then - cat <<EOF - valid_lft forever preferred_lft forever -EOF + echo " valid_lft forever preferred_lft forever" fi } n=1 |