Skip to content

Commit 255ff27

Browse files
authored
bmcsetup: revert previous meaning of bmcport for Dell servers (#7317)
* bmcsetup: revert previous meaning of bmcport for Dell servers, to conform with other server types: 0=shared, 1=dedicated * bmcsetup: remove dependency on `ipmitool delloem` and use raw cmds instead ipmitool delloem may not work on all Dell server generations, functionnality depends on ipmitool versions (see ipmitool/ipmitool#18). So removing thatdependency and using raw IPMI commands seems more robust.
1 parent 9da2038 commit 255ff27

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

xCAT-genesis-scripts/usr/bin/bmcsetup

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -265,12 +265,14 @@ elif [ "$IPMIMFG" == "47488" ]; then
265265
elif [ "$IPMIMFG" == "674" ]; then # DELL
266266
BMCPORT=`grep bmcport /tmp/ipmicfg.xml |awk -F\> '{print $2}'|awk -F\< '{print $1}'`
267267
logger -s -t $log_label -p local4.info "BMCPORT is $BMCPORT"
268-
if [ "$BMCPORT" == "0" ]; then # dedicated
269-
ipmitool delloem lan set dedicated &>/dev/null
270-
elif [ "$BMCPORT" == "1" -o "$BMCPORT" == "2" -o "$BMCPORT" == "3" -o "$BMCPORT" == "4" ]; then # shared
271-
ipmitool delloem lan set shared &>/dev/null
272-
ipmitool delloem lan set shared with lom$BMCPORT &>/dev/null
273-
ipmitool delloem lan set shared with failover all loms &>/dev/null
268+
if [ "$BMCPORT" == "0" ]; then # shared
269+
# https://github.com/ipmitool/ipmitool/issues/18
270+
# ipmitool raw 0x30 0x28 0xAA 0xBB, with:
271+
# AA: 01 = dedicated, 02...05 = shared with lom1...4
272+
# BB: 00 = no failover, 02...05 = failover on lom1...4, , 06 = failover on all loms
273+
ipmitool raw 0x30 0x28 0x02 0x06
274+
elif [ "$BMCPORT" == "1" ]; then # dedicated
275+
ipmitool raw 0x30 0x28 0x01 0x00
274276
fi
275277
elif [ "$IPMIMFG" == "42817" -a "$XPROD" == "16975" ]; then # IBM OpenPOWER servers with OpenBMC (AC922)
276278
ISOPENBMC=1

0 commit comments

Comments
 (0)