xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 03:12:30 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4168 from whowutwut/debug_rflash_openbmc

Browse Source 
[OpenBMC] rflash -l, Reset the update_priority on each loop, or it will pick up the priority from the previous
This commit is contained in:
zet809
2017-10-30 19:47:46 +08:00
committed by GitHub
parent 0133577acf a115e3b7a3
commit a69504b1bf
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
xCAT-server/lib/xcat/plugins/openbmc.pm
View File

@@ -2310,7 +2310,6 @@ sub rflash_response {
my $update_activation = "Unknown";
my $update_purpose;
my $update_version;
my $update_priority = -1;
if ($node_info{$node}{cur_status} eq "RFLASH_LIST_RESPONSE") {
# Get the functional IDs to accurately mark the active running FW
@@ -2335,15 +2334,29 @@ sub rflash_response {
# Entry has no Version attribute, skip listing it
next;
}
if ($xcatdebugmode) {
# Only print if xcatdebugmode is set and XCATBYPASS
print "\n\n================================= XCATBYPASS DEBUG START =================================\n";
print "==> KEY_URL=$key_url\n";
print "==> VERSION=$content{Version}\n";
print "==> Dump out JSON data:\n";
print Dumper(%content);
print "================================= XCATBYPASS DEBUG END =================================\n";
}
if (defined($content{Activation}) and $content{Activation}) {
$update_activation = (split(/\./, $content{Activation}))[ -1 ];
}
if (defined($content{Purpose}) and $content{Purpose}) {
$update_purpose = (split(/\./, $content{Purpose}))[ -1 ];
}
my $update_priority = -1;
# Just check defined, because priority=0 is a valid value
if (defined($content{Priority})) {
$update_priority = (split(/\./, $content{Priority}))[ -1 ];
}
# Add indicators to the active firmware
if (exists($functional->{$update_id}) ) {
#
# If the firmware ID exists in the hash, this indicates the really active running FW
@@ -2357,7 +2370,6 @@ sub rflash_response {
$indicator = "(*)";
}
$update_activation = $update_activation . $indicator;
$update_priority = -1; # Reset update priority for next loop iteration
}
xCAT::SvrUtils::sendmsg(sprintf("%-8s %-7s %-10s %s", $update_id, $update_purpose, $update_activation, $update_version), $callback, $node);
}