diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-02-27 12:11:54 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2018-03-01 19:39:15 +0100 |
| commit | 9260ca217fd58903f924bba48515365f2f2228df (patch) | |
| tree | 6ec840e127dbd01f82f28a32b457f3f948f6b19d /ctdb/tools/onnode | |
| parent | ca315203beab08649993285d0bf6b7a29b542887 (diff) | |
| download | samba-9260ca217fd58903f924bba48515365f2f2228df.tar.gz | |
ctdb-tools: Change onnode to use ONNODE_SSH and ONNODE_SSH_OPTS
Instead of more generic SSH and EXTRA_SSH_OPTS.
Quietly drop reference to rsh in case it gives anyone ideas.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/tools/onnode')
| -rwxr-xr-x | ctdb/tools/onnode | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ctdb/tools/onnode b/ctdb/tools/onnode index ca9673a95b9..0175513d1cb 100755 --- a/ctdb/tools/onnode +++ b/ctdb/tools/onnode @@ -316,19 +316,19 @@ parse_options "$@" ssh_opts= if $push ; then - SSH=push - EXTRA_SSH_OPTS="" + ONNODE_SSH=push + ONNODE_SSH_OPTS="" else $current && command="cd $PWD && $command" if [ -n "$CTDB_NODES_SOCKETS" ] ; then - SSH=fakessh - EXTRA_SSH_OPTS="" + ONNODE_SSH=fakessh + ONNODE_SSH_OPTS="" else # Could "2>/dev/null || true" but want to see errors from typos in file. [ -r "${CTDB_BASE}/onnode.conf" ] && . "${CTDB_BASE}/onnode.conf" - [ -n "$SSH" ] || SSH=ssh - if [ "$SSH" = "ssh" ] ; then + [ -n "$ONNODE_SSH" ] || ONNODE_SSH=ssh + if [ "$ONNODE_SSH" = "ssh" ] ; then if $parallel || ! $stdin ; then ssh_opts="-n" fi @@ -372,7 +372,7 @@ for n in $nodes ; do { exec 3>&1 { - $SSH $ssh_opts $EXTRA_SSH_OPTS "$n" "$command" | + $ONNODE_SSH $ssh_opts $ONNODE_SSH_OPTS "$n" "$command" | stdout_filter >&3 } 2>&1 | stderr_filter } & @@ -385,7 +385,7 @@ for n in $nodes ; do { exec 3>&1 { - $SSH $ssh_opts $EXTRA_SSH_OPTS "$n" "$command" | + $ONNODE_SSH $ssh_opts $ONNODE_SSH_OPTS "$n" "$command" | stdout_filter >&3 } 2>&1 | stderr_filter } || retcode=$? |