From 678110452771d0bd8bac493124fbed808430ec34 Mon Sep 17 00:00:00 2001
From: zhaoertao <zhaoertao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 31 May 2012 10:31:24 +0000
Subject: [PATCH] fix bugs for 'Deferred firmware update' feature

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@12969 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/FSPUtils.pm  | 2 +-
 perl-xCAT/xCAT/PPCrflash.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/perl-xCAT/xCAT/FSPUtils.pm b/perl-xCAT/xCAT/FSPUtils.pm
index 3feb9a790..2017093e5 100644
--- a/perl-xCAT/xCAT/FSPUtils.pm
+++ b/perl-xCAT/xCAT/FSPUtils.pm
@@ -352,7 +352,7 @@ sub fsp_api_action {
     if( $action =~ /^(code_update|get_compatible_version_from_rpm)$/) { 
         $cmd = "$fsp_api -a $action -T $tooltype -t $type:$fsp_ip:$id:$node_name:$parameter -d $install_dir/packages_fw/";
     } elsif($action =~ /^code_updateD$/) {
-        $cmd = "fsp_api -a code_update -D -T $tooltype -t $type:$fsp_ip:$id:$node_name:$parameter -d $install_dir/packages_fw/";
+        $cmd = "$fsp_api -a code_update -D -T $tooltype -t $type:$fsp_ip:$id:$node_name:$parameter -d $install_dir/packages_fw/";
     } elsif($action =~ /^add_connection$/) {
     	$cmd = "$fsp_api -a $action -u $user -p $password -T $tooltype -t $type:$fsp_ip:$id:$node_name:";
     } elsif ($action =~ /^set_frame_number$/) { 
diff --git a/perl-xCAT/xCAT/PPCrflash.pm b/perl-xCAT/xCAT/PPCrflash.pm
index deeebeba4..c1b63e6db 100644
--- a/perl-xCAT/xCAT/PPCrflash.pm
+++ b/perl-xCAT/xCAT/PPCrflash.pm
@@ -206,7 +206,7 @@ sub parse_args {
     ####################
     #suport for "rflash", copy the rpm and xml packages from user-spcefied-directory to /install/packages_fw
     #####################    
-    if ( (!exists($opt{commit})) && (!exists($opt{ recover }))) {
+    if ( (!exists($opt{commit})) && (!exists($opt{ recover })) && (!exists($opt{bpa_acdl}))) {
         if( preprocess_for_rflash($request, \%opt) == -1) {
             return( usage() );
         }