From ed28e714664c75b0e24c2a498e5c150920c905d5 Mon Sep 17 00:00:00 2001
From: jjhua <jjhua@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 29 Sep 2009 11:41:58 +0000
Subject: [PATCH] fixed bug 2869633.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4258 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/PPCrflash.pm      | 2 +-
 xCAT-server/lib/perl/xCAT/PPC.pm | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/perl-xCAT/xCAT/PPCrflash.pm b/perl-xCAT/xCAT/PPCrflash.pm
index a7b13f481..5908c8925 100644
--- a/perl-xCAT/xCAT/PPCrflash.pm
+++ b/perl-xCAT/xCAT/PPCrflash.pm
@@ -539,7 +539,7 @@ sub rflash {
     my $request = shift;
     my $hash    = shift;
     my $exp     = shift;
-    my $subreq  = shift;
+    my $subreq  = $request->{subreq};
     my $hwtype  = @$exp[2];
     my @result;
     my $timeout    = $request->{ppctimeout};
diff --git a/xCAT-server/lib/perl/xCAT/PPC.pm b/xCAT-server/lib/perl/xCAT/PPC.pm
index 485a7b37e..9d1bf5071 100644
--- a/xCAT-server/lib/perl/xCAT/PPC.pm
+++ b/xCAT-server/lib/perl/xCAT/PPC.pm
@@ -51,8 +51,6 @@ my %errmsg = (
         DB_UNDEF   =>"'%s' database not defined"
         );
 
-my $subreq;
-
 ##########################################################################
 # Invokes the callback with the specified message                    
 ##########################################################################
@@ -1119,7 +1117,7 @@ sub invoke_cmd {
     ########################################
     # Process specific command 
     ########################################
-    my $result = runcmd( $request, $nodes, \@exp , $subreq);
+    my $result = runcmd( $request, $nodes, \@exp );
 
     ########################################
     # Close connection to remote server
@@ -1372,7 +1370,7 @@ sub process_request {
     my $package  = shift;
     my $req      = shift;
     my $callback = shift;
-    $subreq      = shift;
+    my $subreq      = shift;
 
     ####################################
     # Get hwtype 
@@ -1387,6 +1385,7 @@ sub process_request {
     $request->{stdin}   = $req->{stdin}->[0]; 
 #    $request->{hwtype}  = $package;
     $request->{callback}= $callback;
+    $request->{subreq}  = $subreq;
     #########################
     #This is a special case for rspconfig and mkhwconn, 
     #we shouldn't set hwtype as$package. and reserved for other commands.