2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-09-06 10:18:20 +00:00

Fix SR635/SR655

First, have to preclude the generic thinksystem treatment.

Also, IPMI 1.5 is no longer supported and we don't need it
so stop enabling it.
This commit is contained in:
Jarrod Johnson
2019-11-12 11:59:11 -05:00
parent 922dfe18c4
commit 42357f9d67

View File

@@ -225,6 +225,17 @@ if [ "$IPMIMFG" == 2 ]; then #IBM
fi
elif [ "$IPMIMFG" == 19046 -a "$XPROD" == 13616 ] ; then
LOCKEDUSERS=1
elif [ "$IPMIMFG" = "19046" -a "$XPROD" = "1287" ]; then
# Lenovo SR635/SR655
BMCPORT=`grep bmcport /tmp/ipmicfg.xml |awk -F\> '{print $2}'|awk -F\< '{print $1}'`
if [ "$BMCPORT" = 0 ]; then
ipmitool raw 0x32 0x71 0 0 3
LANCHAN=1
else
LANCHAN=8
fi
#USBSTATE=$(ipmitool raw 0x32 0xab)
#ipmitool raw 0x32 0xaa 0
elif [ "$IPMIMFG" == 20301 -o "$IPMIMFG" == 19046 -a "$XPROD" != 502 ] ; then
IBMVPDV=`ipmitool raw 0x3a 0xb 2 0 16 1`
logger -s -t $log_label -p local4.info "XPROD is $XPROD, IBMVPDV is $IBMVPDV"
@@ -280,19 +291,6 @@ if [ ! -z "$ISOPENBMC" ]; then
# Overvide the default value for OpenBMC
LAN_MED_TYPE="Other LAN"
fi
USBSTATE=""
if [ "$IPMIMFG" = "19046" -a "$XPROD" = "1287" ]; then
# Lenovo SR635/SR655
BMCPORT=`grep bmcport /tmp/ipmicfg.xml |awk -F\> '{print $2}'|awk -F\< '{print $1}'`
if [ "$BMCPORT" = 0 ]; then
ipmitool raw 0x32 0x71 0 0 3
LANCHAN=1
else
LANCHAN=8
fi
#USBSTATE=$(ipmitool raw 0x32 0xab)
#ipmitool raw 0x32 0xaa 0
fi
while [ -z "$LANCHAN" ]; do
logger -s -t $log_label -p local4.info "Auto detecting LAN channel..."
@@ -591,17 +589,6 @@ while [ $idev -gt 0 ]; do
done
if [ $TRIES -gt $TIMEOUT ]; then logger -s -t $log_label -p local4.err "$MSG: ERROR"; else logger -s -t $log_label -p local4.info "$MSG: OK"; fi
MSG="Enabling IPMI MD5 LAN access"
logger -s -t $log_label -p local4.info "$MSG"
TRIES=0
# Set the auth level to md5 for the channel
while ! ipmitool -d $idev lan set $LANCHAN auth admin md5 > /dev/null; do
sleep 1
let TRIES=TRIES+1
if [ $TRIES -gt $TIMEOUT ]; then break; fi
done
if [ $TRIES -gt $TIMEOUT ]; then logger -s -t $log_label -p local4.err "$MSG: ERROR"; else logger -s -t $log_label -p local4.info "$MSG: OK"; fi
if [ ! "$IPMIVER" == "1.5" ]; then
MSG="Enabling IPMI v 2.0 LAN access"
logger -s -t $log_label -p local4.info "$MSG"