From d7f01fea0e18716acc9f89939db1b73d0bf2bc94 Mon Sep 17 00:00:00 2001
From: bp-sawyers <bp-sawyers@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 16 Nov 2009 12:52:51 +0000
Subject: [PATCH] fix bug 2894545 - change to not use xdsh bypass mode

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4581 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-client/bin/ppping             | 7 +++----
 xCAT-client/pods/man1/ppping.1.pod | 8 +-------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/xCAT-client/bin/ppping b/xCAT-client/bin/ppping
index a90c34c44..fcc844cfc 100755
--- a/xCAT-client/bin/ppping
+++ b/xCAT-client/bin/ppping
@@ -30,7 +30,7 @@ use IO::Select;
 use Getopt::Long;
 my $interface;
 
-my $USAGE="Usage: ppping [-i|--interface interfaces] [-d|--debug] [-V|--verbose] [-q|--quiet] [-s|--serial] [-H|--hierarchical] noderange
+my $USAGE="Usage: ppping [-i|--interface interfaces] [-d|--debug] [-V|--verbose] [-q|--quiet] [-s|--serial] noderange
        ppping -h|--help
        ppping  -v|--version\n"; 
 
@@ -166,9 +166,8 @@ my $allnodes=join(',', @nodes);
 #			to count the pings that come back, unless they request fully quiet mode.
 my $quiet = "";
 if($::QUIET) { $quiet = "-q "; }
-# If hierarchical behavior is wanted, take out the bypass flag
-my $bypass = "-B";
-if($::HIERARCHY){ $bypass = ""; }
+# bypass mode for xdsh is not used any more, because it doesn't give any advantage
+my $bypass = "";
 
 my @interfaces;
 if ($interface) { @interfaces = split(/,/, $interface); }
diff --git a/xCAT-client/pods/man1/ppping.1.pod b/xCAT-client/pods/man1/ppping.1.pod
index 10683dae5..76da88ef2 100644
--- a/xCAT-client/pods/man1/ppping.1.pod
+++ b/xCAT-client/pods/man1/ppping.1.pod
@@ -5,7 +5,7 @@ B<ppping> - parallel ping from nodes to other nodes in the cluster.
 
 =head1 SYNOPSIS
 
-B<ppping> [B<-i>|B<--interface> I<interfaces>] [B<-d>|B<--debug>] [B<-V>|B<--verbose>] [B<-q>|B<--quiet>] [B<-s>|B<--serial>] [B<-H>|B<--hierarchical>] I<noderange>
+B<ppping> [B<-i>|B<--interface> I<interfaces>] [B<-d>|B<--debug>] [B<-V>|B<--verbose>] [B<-q>|B<--quiet>] [B<-s>|B<--serial>] I<noderange>
 
 B<ppping> [B<-h>|B<--help>]
 
@@ -18,8 +18,6 @@ By default, B<ppping> will return an unsorted list of the node pairs that are no
 More or less output can be controlled by the -V and -q options.
 B<ppping> front-ends B<pping> and B<xdsh>.
 
-This command does not support the xcatd client/server communication.  It must be run on the management node. 
-
 =head1 OPTIONS
 
 =over 10
@@ -46,10 +44,6 @@ of the successful pings are displayed, along with all of the unsuccessful pings.
 Display minimum output:  just the unsuccessful pings.  This option has the effect that if all pings are successful, nothing is displayed.
 But it also has the performance benefit that each node does not have to send successful ping info back to the management node.
 
-=item B<-H>|B<--hierarchical>
-
-Enable B<ppping> to run in hierarchical mode (i.e. through service nodes).  By default, B<ppping> does not go through xcatd.
-
 =item B<-d>|B<--debug>
 
 Print debug information.