xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-21 18:50:28 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4998 from gurevichmark/ipmi_rflash_recover

Browse Source 
Better message for --recover option
This commit is contained in:
Victor Hu
2018-03-27 16:13:19 -04:00
committed by GitHub
parent bc1de0529c 20e7dcd7de
commit 5da3a4f945
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/guides/admin-guides/references/man1/rflash.1.rst
View File

@@ -236,7 +236,7 @@ This delete option will delete update image from BMC. It expects an ID as the in
OpenPOWER BMC specific (using IPMI):
Used for IBM Power S822LC for Big Data systems only. Used to recover the BMC with a BMC image downloaded from FixCentral.
Used for IBM Power S822LC for Big Data systems only. Used to recover the BMC with a BMC image downloaded from FixCentral. This option will only work if BMC is in "Brick protection" state.

2
xCAT-client/pods/man1/rflash.1.pod
View File

@@ -173,7 +173,7 @@ Used to recover the flash image in the permanent side of the chip to the tempora
OpenPOWER BMC specific (using IPMI):
Used for IBM Power S822LC for Big Data systems only. Used to recover the BMC with a BMC image downloaded from FixCentral.
Used for IBM Power S822LC for Big Data systems only. Used to recover the BMC with a BMC image downloaded from FixCentral. This option will only work if BMC is in "Brick protection" state.
=item B<--retry=>I<count>

4
xCAT-server/lib/xcat/plugins/ipmi.pm
View File

@@ -2518,6 +2518,10 @@ sub do_rflash_process {
my $cmd = "/usr/bin/tftp $bmcip -m binary -c put $recover_image ".basename($recover_image);
my $output = xCAT::Utils->runcmd($cmd, -1);
if ($::RUNCMD_RC != 0) {
if ($output =~ "timed out") {
# Time out running tftp command. One possible reason is BMC not in "brick protection" mode
$output .= " BMC might not be in 'Brick protection' state";
}
$callback->({ error => "Running tftp command \'$cmd\' failed. Error Code: $::RUNCMD_RC. Output: $output.",
errorcode => 1 });
exit(1);