From cd47c9ef983326aef64b624c071edbbff9262f89 Mon Sep 17 00:00:00 2001
From: jjhua <jjhua@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 12 May 2009 05:15:57 +0000
Subject: [PATCH] fixed defect 2788747. It'l caused by 12 IHs

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3352 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/PPCcli.pm           | 10 +++++++++-
 perl-xCAT/xCAT/PPCrflash.pm        |  5 +++--
 xCAT-client/pods/man1/rflash.1.pod |  2 ++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/perl-xCAT/xCAT/PPCcli.pm b/perl-xCAT/xCAT/PPCcli.pm
index aacbae817..c125f1749 100644
--- a/perl-xCAT/xCAT/PPCcli.pm
+++ b/perl-xCAT/xCAT/PPCcli.pm
@@ -904,7 +904,15 @@ sub lslic {
 
     my $exp = shift;
     my $d   = shift;
+    my $timeout = shift;
     my $cmd = "lslic ";
+    
+    ##########################################
+    # Use timeout from site table (if defined) 
+    ##########################################
+    if ( !defined( $timeout )) {
+        $timeout = @$exp[7] * 3;
+    }
 
     #####################################
     # Command only support on CEC/BPAs
@@ -921,7 +929,7 @@ sub lslic {
     #####################################
     # Send command
     #####################################
-    my $result = send_cmd( $exp, $cmd );
+    my $result = send_cmd( $exp, $cmd , $timeout);
     return( $result );
 
 }
diff --git a/perl-xCAT/xCAT/PPCrflash.pm b/perl-xCAT/xCAT/PPCrflash.pm
index ac06270af..192330d8b 100644
--- a/perl-xCAT/xCAT/PPCrflash.pm
+++ b/perl-xCAT/xCAT/PPCrflash.pm
@@ -350,7 +350,8 @@ sub rflash {
     	my $exp     = shift;
     	my $hwtype  = @$exp[2];
     	my @result;
-	
+        my $timeout    = $request->{ppctimeout};
+
 	$packages_dir = $request->{opt}->{p};
 	$activate = $request->{opt}->{activate};	
 
@@ -427,7 +428,7 @@ sub rflash {
 				}	
 				dpush(\@value, [$hmc,"$mtms:component:$component!"]);
 	
-				my $values = xCAT::PPCcli::lslic( $exp, $d );
+				my $values = xCAT::PPCcli::lslic( $exp, $d, $timeout );
         	    		my $Rc = shift(@$values);
             			#####################################
             			# Return error
diff --git a/xCAT-client/pods/man1/rflash.1.pod b/xCAT-client/pods/man1/rflash.1.pod
index b6982cd78..dfcb3f128 100644
--- a/xCAT-client/pods/man1/rflash.1.pod
+++ b/xCAT-client/pods/man1/rflash.1.pod
@@ -38,6 +38,8 @@ Any previously activated code on the affected systems will be automatically acce
 
 B<IMPORTANT!>  If the power subsystem is recycled, all of its attached managed systems will be recycled. 
 
+If it outputs B<"Timeout waiting for prompt"> during the upgrade, please set the B<"ppctimeout"> larger in the B<site> table. After the upgrade, remeber to change it back. If run the B<"rflash"> command on an AIX management node, need to make sure the value of B<"useSSHonAIX"> is B<"yes"> in the site table.
+
 =head1 B<Options>
 
 =over 7