From a0d928d7e7a277179fae5c864309852fc0d42809 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Fri, 25 Jun 2010 14:37:18 +0000 Subject: [PATCH] -Correct errors in bmcsetup enhancements git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6607 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-nbroot/overlay/bin/bmcsetup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-nbroot/overlay/bin/bmcsetup b/xCAT-nbroot/overlay/bin/bmcsetup index e9ba536b8..262b890e6 100755 --- a/xCAT-nbroot/overlay/bin/bmcsetup +++ b/xCAT-nbroot/overlay/bin/bmcsetup @@ -59,7 +59,7 @@ elif [ "$IPMIMFG" == 20301 ] ; then XPROD=`ipmitool mc info|grep "^Product ID"|awk '{print $4}'` if [ "$XPROD" == "220" ]; then BMCPORT=`grep bmcport /tmp/ipmi.data |awk -F\> '{print $2}'|awk -F\< '{print $1}'` - ` if [ ! -z "$BMCPORT" ]; then + if [ ! -z "$BMCPORT" ]; then ipmitool raw 0xc 1 1 0xc0 $BMCPORT fi fi @@ -67,7 +67,7 @@ fi echo -n "Auto detecting LAN channel." for LANCHAN in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16; do - if ipmitool channel info $LANCHAN 2> /dev/null | grep 802.3 >& /dev/null && ipmitool raw 0xc 2 $LANCHAN 5 0 0 >& /dev/null; + if ipmitool channel info $LANCHAN 2> /dev/null | grep 802.3 > /dev/null 2>&1 && ipmitool raw 0xc 2 $LANCHAN 5 0 0 > /dev/null 2>&1; then break; fi; echo -n "."