From 04ba40f28b94de0b9f266e0a5fd725b8de86de6e Mon Sep 17 00:00:00 2001
From: zhaoertao <zhaoertao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 7 May 2012 07:18:09 +0000
Subject: [PATCH] Wrongly checked in the code about 'firmware deferred update',
 regress back to the previous revision.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@12543 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/FSPflash.pm  |  5 ++---
 perl-xCAT/xCAT/PPCrflash.pm | 10 +---------
 perl-xCAT/xCAT/Usage.pm     |  5 ++---
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/perl-xCAT/xCAT/FSPflash.pm b/perl-xCAT/xCAT/FSPflash.pm
index 837ec5595..c02d140e5 100644
--- a/perl-xCAT/xCAT/FSPflash.pm
+++ b/perl-xCAT/xCAT/FSPflash.pm
@@ -261,7 +261,7 @@ sub rflash {
 	       	
 	        my $frame = $$d[5];
                 my $type = xCAT::DBobjUtils->getnodetype($frame);
-                if ( ( $frame ne $name ) && ( $type eq "frame" ) && $activate !~ /^deferred$/){
+                if ( ( $frame ne $name ) && ( $type eq "frame" ) ){
                     
                     my @frame_d = (0, 0, 0, $frame, "frame", 0);
 	            $action = "list_firmware_level";
@@ -327,8 +327,7 @@ sub rflash {
     	  
            if($housekeeping =~ /^commit$/) { $action = "code_commit"}
            if($housekeeping =~ /^recover$/) { $action = "code_reject"}
-           if($housekeeping =~ /^bpa_acdl$/) { $action = "acdl"}
-           if($activate =~ /^(disruptive|deferred)$/) { 
+           if($activate =~ /^disruptive$/) { 
                $action = "code_update";
            }
            if($activate =~ /^concurrent$/) {
diff --git a/perl-xCAT/xCAT/PPCrflash.pm b/perl-xCAT/xCAT/PPCrflash.pm
index 272ccc0f1..db5fec182 100644
--- a/perl-xCAT/xCAT/PPCrflash.pm
+++ b/perl-xCAT/xCAT/PPCrflash.pm
@@ -94,7 +94,7 @@ sub parse_args {
     $Getopt::Long::ignorecase = 0;
     Getopt::Long::Configure( "bundling" );
 
-    if ( !GetOptions( \%opt, qw(h|help v|version V|verbose p=s d=s activate=s commit recover bpa_acdl) )) {
+    if ( !GetOptions( \%opt, qw(h|help v|version V|verbose p=s d=s activate=s commit recover) )) {
         return( usage() );
     }
     
@@ -112,11 +112,6 @@ sub parse_args {
     #################################
     #Option --activate not valid with --commit or --recover
     #################################
-    if (exists($opt{bpa_acdl}) && (exists($opt{activate}) || exists($opt{commit}) || 
-                                   exists($opt{recover}) || exists($opt{p}) || exists($opt{d}))) {
-        return ( usage("Option --bpa_acdl not valid with other options "));
-    }
-    
     if( exists( $opt{activate} ) && (exists( $opt{commit}) || exists( $opt{recover}))) {
         return( usage("Option --activate not valid with --commit or --recover ") );
     }    
@@ -186,9 +181,6 @@ sub parse_args {
     } elsif( defined( $opt{ recover }) ) {
         print "recover flag\n";
         $housekeeping = "recover";
-    } elsif (defined( $opt{ bpa_acdl})) {
-        print "bpa_acdl flag\n";
-        $housekeeping = "bpa_acdl";
     } else {
         print "no housekeeping - update mode\n";
         $housekeeping = undef;
diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index 802bd5c29..f5afc5dd6 100644
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -268,9 +268,8 @@ my %usage = (
 	rflash <noderange> -p <rpm_directory> [--activate concurrent | disruptive][-V|--verbose] 
 	rflash <noderange> [--commit | --recover] [-V|--verbose]
     PPC (using Direct FSP Management) specific:
-	rflash <noderange> -p <rpm_directory> [--activate disruptive | deferred] [-d <data_directory>]
-	rflash <noderange> [--commit | --recover] [-V|--verbose]
-    rflash <noderange> [--bpa_acdl]",
+	rflash <noderange> -p <rpm_directory> --activate disruptive [-d <data_directory>]
+	rflash <noderange> [--commit | --recover] [-V|--verbose]",
     "mkhwconn" =>
 "Usage:
     mkhwconn [-h|--help]