From: Martin Schwenke <martin@meltin.net>
Date: Wed, 28 Feb 2018 04:02:03 +0000 (+1100)
Subject: ctdb-tools: Introduce a variable to hold the ssh command
X-Git-Tag: talloc-2.1.12~318
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=248c37413756c582f50b820fafb03d59fa2e0f99;p=thirdparty%2Fsamba.git

ctdb-tools: Introduce a variable to hold the ssh command

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/tools/onnode b/ctdb/tools/onnode
index 0175513d1cb..890b60f0afc 100755
--- a/ctdb/tools/onnode
+++ b/ctdb/tools/onnode
@@ -368,11 +368,12 @@ for n in $nodes ; do
     # the filters to operate independently, the output of
     # stdout_filter is sent to a temporary file descriptor (3), which
     # is redirected back to stdout at the outermost level.
+    ssh_cmd="$ONNODE_SSH $ssh_opts $ONNODE_SSH_OPTS"
     if $parallel ; then
 	{
 	    exec 3>&1
 	    {
-		$ONNODE_SSH $ssh_opts $ONNODE_SSH_OPTS "$n" "$command" |
+		$ssh_cmd "$n" "$command" |
 		    stdout_filter >&3
 	    } 2>&1 | stderr_filter
 	} &
@@ -385,7 +386,7 @@ for n in $nodes ; do
 	{
 	    exec 3>&1
 	    {
-		$ONNODE_SSH $ssh_opts $ONNODE_SSH_OPTS "$n" "$command" |
+		$ssh_cmd "$n" "$command" |
 		    stdout_filter >&3
 	    } 2>&1 | stderr_filter
 	} || retcode=$?