From a1d590f85f8d61707deaf2bfcf4ffa025f0e9c67 Mon Sep 17 00:00:00 2001
From: XuWei <xwbj@cn.ibm.com>
Date: Wed, 21 Dec 2016 03:32:20 -0500
Subject: [PATCH] fix issue 2296, get correct mtms for B&S

---
 xCAT-server/lib/xcat/plugins/bmcdiscover.pm | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
index 54d7ce8b7..18e3a09e2 100644
--- a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
+++ b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
@@ -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;
                     }
                 }
             }