diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-10-03 19:13:57 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2018-10-08 02:46:23 +0200 |
| commit | 2aa006a31117769dd440661cf54394590c4b8f11 (patch) | |
| tree | 64cce3f91eed450330e57a10fc6172c951d2fa99 /ctdb/tools/onnode | |
| parent | 6ac5124b0117b7b5f3c5402934c93633ce186896 (diff) | |
| download | samba-2aa006a31117769dd440661cf54394590c4b8f11.tar.gz | |
ctdb-tools: Have onnode pass -n option even when regular ssh not in use
ONNODE_SSH is really a test hook, so it doesn't need to support
completely random values.
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 | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/ctdb/tools/onnode b/ctdb/tools/onnode index bef04b0fce0..eabe034d227 100755 --- a/ctdb/tools/onnode +++ b/ctdb/tools/onnode @@ -302,12 +302,9 @@ 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 "$ONNODE_SSH" ] || ONNODE_SSH=ssh - if [ "$ONNODE_SSH" = "ssh" ] ; then - if $parallel || ! $stdin ; then - ssh_opts="-n" - fi - else - : # rsh? All bets are off! + # $ONNODE_SSH must accept the -n option - it can be ignored! + if $parallel || ! $stdin ; then + ssh_opts="-n" fi fi |