From df3a89c6a9a82f761cfd81c081f2c604b24247be Mon Sep 17 00:00:00 2001
From: Kilian Cavalotti <kilian@stanford.edu>
Date: Tue, 30 Jan 2018 17:56:14 -0800
Subject: [PATCH] dodiscovery: FRU info may be present may incomplete. Check
 the contents of MTM obtained from FRU and fallback to DMI if it's empty.

---
 xCAT-genesis-scripts/usr/bin/dodiscovery | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xCAT-genesis-scripts/usr/bin/dodiscovery b/xCAT-genesis-scripts/usr/bin/dodiscovery
index c23f99fae..b83759ecf 100755
--- a/xCAT-genesis-scripts/usr/bin/dodiscovery
+++ b/xCAT-genesis-scripts/usr/bin/dodiscovery
@@ -95,7 +95,8 @@ if [ -r /sys/devices/virtual/dmi/id/product_name ]; then  #x86
 			FRU=`ipmitool fru print 0`
 			if [ $? -eq 0 ]; then
                                 MTM=`echo "$FRU" | awk -F': ' '/Product Manufacturer/ {m=$2} /Product Name|Product Part Number/ {if (n==""||n=="NONE") {n=$2}} END {print m":"n}'`
-			else
+            fi
+            if [ -z "$MTM" -o "$MTM" == ":" ]; then
 				logger -s -t $log_label -p local4.warning "Couldn't find MTM information in FRU, falling back to DMI (MTMS-based discovery may fail)"
 				m=`cat /sys/devices/virtual/dmi/id/sys_vendor`
 				n=`cat /sys/devices/virtual/dmi/id/product_name`