From 7fd9270d00a59aef5751c720f33900e6c2bebb86 Mon Sep 17 00:00:00 2001
From: wanghuaz <wanghuaz@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 24 Apr 2009 10:33:09 +0000
Subject: [PATCH] Add -f for rcons to optionally take write privilege of the
 console.  By default, rcons only return a readonly console

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3253 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-client/bin/rcons                | 21 +++++++++++++--------
 xCAT-server/sbin/lpar_netboot.expect |  2 +-
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/xCAT-client/bin/rcons b/xCAT-client/bin/rcons
index 1d7f19b7d..2d19ecdd1 100755
--- a/xCAT-client/bin/rcons
+++ b/xCAT-client/bin/rcons
@@ -1,8 +1,8 @@
 #!/bin/sh
-CONSERVER=$2
 if [ $1 = -h  ]; then
     echo "rcons - remotely accesses the serial console of a node"
     echo "rcons <singlenode>"
+    echo "rcons <singlenode> [conserver] [-f]"
     echo "rcons [-h|--help|-v|--version]"
     exit 0
 fi
@@ -10,11 +10,16 @@ if [ $1 = -v  ]; then
     echo "Version 2.1"
     exit 0
 fi
-#if [ -z "$CONSERVER" ]; then
-#   CONSERVER=`nodels $1 nodehm.conserver`
-#if [ -z "$CONSERVER" ]; then
-#   CONSERVER=`nodels $1 nodehm.conserver`
-#fi
+
+if [ -n "$3" ] && [ "$3" = "-f" ]; then
+    FORCE=-f
+    CONSERVER=$2
+fi
+
+if [ -n "$2" ] && [ "$2" = "-f" ]; then
+    FORCE=-f
+fi
+
 if [ -z "$CONSERVER" ]; then
 	CONSERVER=$XCATHOST
 fi
@@ -32,5 +37,5 @@ if [ ! -f $HOME/.consolerc ]; then
 	echo "	sslcredentials $HOME/.xcat/client-cred.pem;" >> $HOME/.consolerc
 	echo '}' >> $HOME/.consolerc
 fi
-	
-exec console -f -M $CONSERVER $1
+
+exec console $FORCE -M $CONSERVER $1
diff --git a/xCAT-server/sbin/lpar_netboot.expect b/xCAT-server/sbin/lpar_netboot.expect
index 6bf2db158..493ae7ece 100644
--- a/xCAT-server/sbin/lpar_netboot.expect
+++ b/xCAT-server/sbin/lpar_netboot.expect
@@ -2187,7 +2187,7 @@ nc_msg "$PROGRAM Status: finished connecting to $hcp\n"
 #
 nc_msg "$PROGRAM Status: open port\n"
 
-if [ catch { spawn $CONSOLEBIN $name } rsconole_pid ] {
+if [ catch { spawn $CONSOLEBIN $name -f } rsconole_pid ] {
     send_user "Unable to spawn console connection to $hcp\n"
     exit 1
 }