diff --git a/perl-xCAT/xCAT/PPC.pm b/perl-xCAT/xCAT/PPC.pm index 32b343af7..414a00cd5 100644 --- a/perl-xCAT/xCAT/PPC.pm +++ b/perl-xCAT/xCAT/PPC.pm @@ -1054,7 +1054,8 @@ sub preprocess_request { #################### #suport for "rflash", copy the rpm and xml packages from user-spcefied-directory to /install/packages_fw ##################### - if ( $command eq "rflash" ) { + if ( ( $command eq "rflash" ) && (grep(/commit/,@exargs) == 0 && grep(/recover/,@exargs) == 0)) { + # if ( $command eq "rflash" ) { preprocess_for_rflash($req,$callback, \@exargs); } @@ -1068,7 +1069,7 @@ sub preprocess_request { # build each request for each service node foreach my $snkey (keys %$sn) { - #print "snkey=$snkey\n"; + #$callback->({data=>["The service node $snkey "]}); my $reqcopy = {%$req}; $reqcopy->{'_xcatdest'} = $snkey; my $hcps1=$sn->{$snkey}; diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm index 58a0009e9..80f0ba994 100644 --- a/perl-xCAT/xCAT/Usage.pm +++ b/perl-xCAT/xCAT/Usage.pm @@ -120,7 +120,8 @@ my %usage = ( [-t tries][-m][-e cmd][-c [timeout[timeout,..]]]", "rflash" => "Usage: rflash [ -h|--help|-v|--version] - rflash noderange -p directory [--activate concurrent | disruptive] [--commit | --recover] [-V|--verbose]" + rflash -p directory [--activate concurrent | disruptive][-V|--verbose] + rflash [--commit | --recover] [-V|--verbose]" ); my $vers = xCAT::Utils->Version(); my %version = ( diff --git a/xCAT-client/pods/man1/rflash.1.pod b/xCAT-client/pods/man1/rflash.1.pod index 4484df68e..8cb86c15f 100644 --- a/xCAT-client/pods/man1/rflash.1.pod +++ b/xCAT-client/pods/man1/rflash.1.pod @@ -4,17 +4,21 @@ B - Performs Licensed Internal Code (LIC) update support for HMC-attache =head1 B -B [B<-h>|B<--help>][B<-v>|B<--version>] +B [B<-h>|B<--help> | B<-v>|B<--version>] -B I B<-p> I [B<--activate> B|B][B<--commit>|B<--recover>] [B<-V>|B<--verbose>] +B I B<-p> I [B<--activate> B|B] [B<-V>|B<--verbose>] + +B I [B<--commit>|B<--recover>] [B<-V>|B<--verbose>] =head1 B -B The B command initiates Firmware updates on supported xCAT compute nodes. Licensed Internal Code (also known as microcode) updates are performed on supported HMC-attached POWER5 and POWER6 pSeries nodes. The command scans the specified directory structure for Firmware update package files applicable to the given nodes and components. And then it will B select the B version for the upgrade. +B The B command initiates Firmware updates on supported xCAT nodes. Licensed Internal Code (also known as microcode) updates are performed on supported HMC-attached POWER5 and POWER6 pSeries nodes. + +The command scans the specified directory structure for Firmware update package files applicable to the given nodes and components. And then it will B select the B version for the upgrade. The firmware update files include the Microcode update package and associated XML file. They can be downloaded from the IBM Web site: I. The POWER5 and POWER6 systems contain several components that use Licensed Internal Code. The B command supports two of these components: the managed system (also known as the Central Electronics Complex, or CEC) and the power subsystem (also known as the Bulk Power Assembly (BPA) or Bulk Power Controller (BPC)). Some POWER5 managed systems can be attached to a power subsystem. These power subsystems can support multiple managed systems. When the B command is invoked, xCAT will determine the managed system or power subsystem associated with that CEC and perform the update. -The B can be an CEC or CEC list, a Lpar or Lpar list and a BPA or BPA list. When the I is an CEC or CEC list, B will upgrade the firmware of the CEC or CECs in the cec list. If I is a Lpar or Lpar list, B will update Licensed Internal Code (LIC) on HMC-attached POWER5 and POWER6 pSeries nodes. If I is a BPA or BPA list, B will update Licensed Internal Code (LIC) of the power subsystem on HMC-attached POWER5 and POWER6 pSeries nodes. The I can also be the specified node groups. You can specify a comma or space-separated list of node group ranges. See the I man page for detailed usage information. +The B can be an CEC or CEC list, a Lpar or Lpar list and a BPA or BPA list. But CEC (or Lpar) and BPA B be used at the same time. When the I is an CEC or CEC list, B will upgrade the firmware of the CEC or CECs in the cec list. If I is a Lpar or Lpar list, B will update Licensed Internal Code (LIC) on HMC-attached POWER5 and POWER6 pSeries nodes. If I is a BPA or BPA list, B will update Licensed Internal Code (LIC) of the power subsystem on HMC-attached POWER5 and POWER6 pSeries nodes. The I can also be the specified node groups. You can specify a comma or space-separated list of node group ranges. See the I man page for detailed usage information. The B command uses the B command to connect to the HMC controlling the given managed system and perform the updates. @@ -26,6 +30,8 @@ The flash chip of a POWER5 and POWER6 managed system or power subsystem stores f The B<--commit> flag is used to write the contents of the temporary side of the flash to the permanent side. This flag should be used after updating code and verifying correct system operation. The B<--recover> flag is used to write the permanent side of the flash chip back to the temporary side. This flag should be used to recover from a corrupt flash operation, so that the previously running code can be restored. +BAt present, the B command B support B for BPAs. Because the command "B" on HMC doesn't support the "B" and "B" operation for the BPA. And "B" is dependent on the "B" command. So when the B<--commit> or B<--recover> two flags is used, the noderange cannot be a BPA or BPA list in the B command. xCAT will pay the attention to the changes all the time. + xCAT recommends that you shutdown your Operating System images and power off your managed systems before applying disruptive updates to managed systems or power subsystems. Any previously activated code on the affected systems will be automatically accepted into permanent flash by this procedure.