sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

ctdb-tools: Have onnode pass -n option even when regular ssh not in use

Browse Source 
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>
This commit is contained in:
Martin Schwenke 2018-10-03 19:13:57 +10:00 committed by Amitay Isaacs
parent 6ac5124b01
commit 2aa006a311
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ctdb/tools/onnode
View File

@ -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