From: Martin Schwenke <martin@meltin.net>
Date: Fri, 28 Jun 2019 05:43:27 +0000 (+1000)
Subject: ctdb-tools: Drop onnode -o option
X-Git-Tag: samba-4.11.0rc1~68
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=90de5e0594b9180226b9a13293afe31f18576b3d;p=thirdparty%2Fsamba.git

ctdb-tools: Drop onnode -o option

I don't think anyone uses this and it causes complications.

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

diff --git a/ctdb/doc/onnode.1.xml b/ctdb/doc/onnode.1.xml
index c9d56a97dd5..f7da04aedbe 100644
--- a/ctdb/doc/onnode.1.xml
+++ b/ctdb/doc/onnode.1.xml
@@ -90,15 +90,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry><term>-o <parameter>PREFIX</parameter></term>
-        <listitem>
-          <para>
-	    Causes standard output from each node to be saved into a
-	    file with name PREFIX.<replaceable>IP</replaceable>.
-	  </para>
-        </listitem>
-      </varlistentry>
-
       <varlistentry><term>-p</term>
         <listitem>
           <para>
diff --git a/ctdb/tools/onnode b/ctdb/tools/onnode
index 13b0d19b3ee..76cd2217a0d 100755
--- a/ctdb/tools/onnode
+++ b/ctdb/tools/onnode
@@ -34,7 +34,6 @@ Usage: onnode [OPTION] ... <NODES> <COMMAND> ...
     -f          Specify nodes file, overriding default.
     -i          Keep standard input open - the default is to close it.
     -n          Allow nodes to be specified by name.
-    -o <prefix> Save standard output from each node to file <prefix>.<ip>
     -p          Run command in parallel on specified nodes.
     -P          Push given files to nodes instead of running commands.
     -q          Do not print node addresses (overrides -v).
@@ -61,7 +60,6 @@ ctdb_nodes_file=""
 parallel=false
 verbose=false
 quiet=false
-prefix=""
 names_ok=false
 push=false
 stdin=false
@@ -79,7 +77,6 @@ parse_options ()
 		c) current=true ;;
 		f) ctdb_nodes_file="$OPTARG" ;;
 		n) names_ok=true ;;
-		o) prefix="$OPTARG" ;;
 		p) parallel=true ;;
 		q) quiet=true ;;
 		v) verbose=true ;;
@@ -274,9 +271,7 @@ push()
 
 stdout_filter ()
 {
-    if [ -n "$prefix" ] ; then
-	cat >"${prefix}.${n//\//_}"
-    elif $verbose && $parallel ; then
+    if $verbose && $parallel ; then
 	sed -e "s@^@[$n] @"
     else
 	cat