arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

3974 rinv failed for Fujitsu Blade Server

Browse Source
This commit is contained in:
zhaoertao
2014-01-22 23:17:13 -08:00
parent caceaab306
commit e62b5b43a8
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2681,7 +2681,9 @@ sub add_fruhash {
$fru->rec_type("hw");
}
$fru->value($sessdata->{currfrudata});
$fru->desc($sessdata->{currfrusdr}->id_string);
if (exists($sessdata->{currfrusdr})) {
$fru->desc($sessdata->{currfrusdr}->id_string);
}
$sessdata->{fru_hash}->{$sessdata->{frudex}} = $fru;
$sessdata->{frudex} += 1;
} elsif ($sessdata->{currfrutype} and $sessdata->{currfrutype} eq 'dimm') {
@@ -2699,9 +2701,13 @@ sub add_fruhash {
$fru->rec_type("hw");
}
$fru->value($err);
$fru->desc($sessdata->{currfrusdr}->id_string);
$sessdata->{fru_hash}->{$sessdata->{frudex}} = $fru;
$sessdata->{frudex} += 1;
if (exists($sessdata->{currfrusdr})) {
$fru->desc($sessdata->{currfrusdr}->id_string);
}
if (exists($sessdata->{frudex})) {
$sessdata->{fru_hash}->{$sessdata->{frudex}} = $fru;
$sessdata->{frudex} += 1;
}
undef $sessdata->{currfrudata}; #skip useless calls to add more frus when parsing failed miserably anyway
#xCAT::SvrUtils::sendmsg([1,":Error reading fru area ".$sessdata->{currfruid}.": $err"],$callback);