From 053ffe4795b02bfb610bf60d6bd2ec2d6f4a436d Mon Sep 17 00:00:00 2001
From: linggao <linggao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 13 Dec 2012 18:37:40 +0000
Subject: [PATCH] fixed defect 3159 rcons does not work when nodehm.conserver
 is set to MN

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14643 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-client/bin/rcons | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xCAT-client/bin/rcons b/xCAT-client/bin/rcons
index 694831a69..8e9b615ed 100755
--- a/xCAT-client/bin/rcons
+++ b/xCAT-client/bin/rcons
@@ -1,4 +1,4 @@
-#!/bin/sh 
+#!/bin/sh -x
 
 # Provide serial console access to nodes
 
@@ -97,7 +97,7 @@ else
     if [ -z "$CONSERVER" ]; then  
 	CONSERVER=`echo "$output"|grep nodehm.conserver|cut -d: -f3|tr -d ' \n'`
     fi
-    CONS=`echo "$output" |grep nodehm.cons|cut -d: -f3 | tr -d ' \n'`
+    CONS=`echo "$output" |grep /nodehm.cons$/|cut -d: -f3 | tr -d ' \n'`
     if [ -z "$CONS" ]; then
 	CONS=`echo "$output"|grep nodehm.mgt|cut -d: -f3 | tr -d ' \n'`
     fi
@@ -105,7 +105,7 @@ else
 	echo "Error: nodehm.mgt or nodehm.cons for node $1 not setup."
 	exit 1;
     fi
-    #echo "CONS=$CONS CONSERSRVER=$CONSERVER"
+    #echo "CONS=$CONS CONSERVER=$CONSERVER"
 
     # check if others are using the console
     if [[ -n $CONSERVER ]]; then