2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-22 03:32:04 +00:00

Merge pull request #3133 from stanford-rc/enhance_mtm

Enhance MTM detection from FRU pages
This commit is contained in:
zet809 2017-09-06 16:19:55 +08:00 committed by GitHub
commit a4c525836a

View File

@ -99,13 +99,17 @@ if [ -r /sys/devices/virtual/dmi/id/product_name ]; then #x86
if [ -z "$MTM" ]; then
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}'`
m=`echo "$FRU" | awk -F': ' '/Product Manufacturer/ {print $2}'`
n=`echo "$FRU" | awk -F': ' '/Product Name/ {print $2}'`
if [ -z "$n" -o "$n" == "NONE" ]; then
n=`echo "$FRU" | awk -F': ' '/Product Part Number/ {print $2}'`
fi
else
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`
MTM="$m:$n"
fi
MTM="$m:$n"
fi
SERIAL=`cat /sys/devices/virtual/dmi/id/product_serial`
fi