sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

ctdb-tools: Change onnode to use ONNODE_SSH and ONNODE_SSH_OPTS

Browse Source 
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>
This commit is contained in:
Martin Schwenke 2018-02-27 12:11:54 +11:00 committed by Martin Schwenke
parent ca315203be
commit 9260ca217f
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ctdb/doc/onnode.1.xml
View File

@ -74,8 +74,8 @@
Keep standard input open, allowing data to be piped to
onnode. Normally onnode closes stdin to avoid surprises
when scripting. Note that this option is ignored when
using <option>-p</option> or if <envar>SSH</envar> is set
to anything other than "ssh".
using <option>-p</option> or if <envar>ONNODE_SSH</envar>
is set to anything other than "ssh".
</para>
</listitem>
</varlistentry>
@ -292,16 +292,16 @@
</listitem>
</varlistentry>
<varlistentry><term><filename>/usr/local/etc/ctdb/onnode.conf</filename></term>
<listitem>
<para>
If this file exists it is sourced by onnode. The main
purpose is to allow the administrator to set
<envar>SSH</envar> to something other than "ssh". In this
case the -t option is ignored. For example, the
administrator may choose to use use rsh instead of ssh.
<varlistentry>
<term><filename>/usr/local/etc/ctdb/onnode.conf</filename></term>
<listitem>
<para>
If this file exists it is sourced by onnode. The main
purpose is to allow the administrator to set
<envar>ONNODE_SSH</envar> to something other than "ssh".
In this case the -t option is ignored.
</para>
</listitem>
</listitem>
</varlistentry>
</variablelist>
</refsect1>

16
ctdb/tools/onnode
View File

@ -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=$?