2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 09:36:41 +00:00

Merge pull request #215 from zet809/rinv_sort_firestone

fix issue 212: rinv all doesn't work for firestone JMET machine
This commit is contained in:
Xiaopeng Wang 2015-09-25 15:13:50 +08:00
commit 172ca1c3db

View File

@ -2273,7 +2273,7 @@ sub fru_initted {
my @types = @{$sessdata->{invtypes}};
my $format = "%-20s %s";
foreach $key (sort keys %{$sessdata->{fru_hash}}) {
foreach $key (sort {$a <=> $b} keys %{$sessdata->{fru_hash}}) {
my $fru = $sessdata->{fru_hash}->{$key};
my $type;
foreach $type (split /,/,$fru->rec_type) {
@ -3285,6 +3285,7 @@ sub readcurrfrudevice {
}
my @data = @{$rsp->{data}};
if ($data[0] != $sessdata->{currfruchunk}) {
add_fruhash($sessdata);
xCAT::SvrUtils::sendmsg([1,"Received incorrect data from BMC"],$callback,$sessdata->{node},%allerrornodes);
return;
}