xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-31 01:56:39 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2340 from xuweibj/bmcinfo

Browse Source 
fix issue 2296, get correct mtms for B&S
This commit is contained in:
zet809 2016-12-22 16:00:39 +08:00 committed by GitHub
commit 6d5b7dba32
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
xCAT-server/lib/xcat/plugins/bmcdiscover.pm
View File

@ -910,19 +910,16 @@ sub bmcdiscovery_ipmi {
if (($::RUNCMD_RC eq 0) && @fru_output_array) {
my $fru_output = join(" ", @fru_output_array);
if ($fru_cmd_num == 0) {
if (($fru_output =~ /Product Part Number :\s*(\S*).*Product Serial :\s*(\S*)/)) {
$mtm = $1;
$serial = $2;
last;
}
if (($fru_output =~ /Chassis Part Number\s*:\s*(\S*).*Chassis Serial\s*:\s*(\S*)/)) {
$mtm = $1;
$serial = $2;
last;
}
else {
if (($fru_output =~ /Chassis Part Number\s*:\s*(\S*).*Chassis Serial\s*:\s*(\S*)/)) {
$mtm = $1;
$serial = $2;
last;
}
if (($fru_output =~ /Product Part Number :\s*(\S*).*Product Serial :\s*(\S*)/)) {
$mtm = $1;
$serial = $2;
last;
}
}
}