From f680da48fb79c27ba524b51392749b38605fba59 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 10 Nov 2010 15:21:04 +0000
Subject: [PATCH] -Correct for ID change

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8116 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-nbroot/overlay/bin/bmcsetup | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/xCAT-nbroot/overlay/bin/bmcsetup b/xCAT-nbroot/overlay/bin/bmcsetup
index e72c7605f..f569fd1d1 100755
--- a/xCAT-nbroot/overlay/bin/bmcsetup
+++ b/xCAT-nbroot/overlay/bin/bmcsetup
@@ -37,12 +37,21 @@ kill $CREDPID
 IPMIVER=`ipmitool mc info|grep ^IPMI|awk  '{print $4}'`
 IPMIMFG=`ipmitool mc info|grep "^Manufacturer ID"|awk  '{print $4}'`
 if [ "$IPMIMFG" == 2 ]; then #IBM
-    IBMFAM=`ipmitool raw 0x3a 0x50 |head -n 1| awk '{print $1 $2 $3 $4}'`
-    if [ "$IBMFAM" == "59554f4f" ]; then
+    XPROD=`ipmitool mc info|grep "^Product ID"|awk '{print $4}'`
+    if [ "$XPROD" == "220" ]; then
+        LOCKEDUSERS=1
         BMCPORT=`grep bmcport /tmp/ipmi.data |awk -F\> '{print $2}'|awk -F\< '{print $1}'`
         if [ ! -z "$BMCPORT" ]; then
             ipmitool raw 0xc 1 1 0xc0 $BMCPORT > /dev/null
         fi
+    else
+        IBMFAM=`ipmitool raw 0x3a 0x50 |head -n 1| awk '{print $1 $2 $3 $4}'`
+        if [ "$IBMFAM" == "59554f4f" ]; then
+            BMCPORT=`grep bmcport /tmp/ipmi.data |awk -F\> '{print $2}'|awk -F\< '{print $1}'`
+            if [ ! -z "$BMCPORT" ]; then
+                ipmitool raw 0xc 1 1 0xc0 $BMCPORT > /dev/null
+            fi
+        fi
     fi
 elif [ "$IPMIMFG" == 20301 ] ; then
     XPROD=`ipmitool mc info|grep "^Product ID"|awk '{print $4}'`