From c0c6082b138ba3c1d6f54247f70ff0c518d28e9b Mon Sep 17 00:00:00 2001 From: Kilian Cavalotti Date: Mon, 13 Feb 2017 10:57:26 -0800 Subject: [PATCH] dodiscovery: use information from FRU instead of DMI for MTM Don't use information from DMI to populate the MTM field, as there is no guarantee it will match with what's in the FRU pages. Since `bmcdiscover` uses FRU information, use it in `dosdiscovery` too so they will match for MTMS discovery. --- xCAT-genesis-scripts/bin/dodiscovery | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/xCAT-genesis-scripts/bin/dodiscovery b/xCAT-genesis-scripts/bin/dodiscovery index 8461c9f2b..5bb3bb894 100755 --- a/xCAT-genesis-scripts/bin/dodiscovery +++ b/xCAT-genesis-scripts/bin/dodiscovery @@ -73,14 +73,11 @@ if [ -r /sys/devices/virtual/dmi/id/product_name ]; then #x86 else MTM=`cat /sys/devices/virtual/dmi/id/product_name|awk -F'[' '{print $2}'|awk -F']' '{print $1}'` if [ -z "$MTM" ]; then - SYS=`cat /sys/devices/virtual/dmi/id/sys_vendor` - PRD=`cat /sys/devices/virtual/dmi/id/product_name` - if [ ! -z "$SYS" ]; then - MTM=${SYS^^}":"${PRD^^} - else - MTM=${PRD^^} - fi - fi + FRU=`ipmitool fru print 0` + if [ $? -eq 0 ]; then + MTM=`echo "$FRU" | awk -F': ' '/Product Manufacturer/ {m=$2} /Product Name/ {n=$2} END {print m":"n}'` + fi + fi SERIAL=`cat /sys/devices/virtual/dmi/id/product_serial` fi CPUCOUNT=`cat /proc/cpuinfo |grep "model name"|wc -l`