From 22370febeb71b53fdc7c7b4866baaf4e57fc6dcf Mon Sep 17 00:00:00 2001
From: bp-sawyers <bp-sawyers@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 1 Sep 2009 15:55:58 +0000
Subject: [PATCH] Fixed bug 2845137 in rcons:  syntax error if no nodename
 specified.  Also improved man page.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4067 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-client/bin/rcons             |  5 ++---
 xCAT-client/pods/man1/rcons.1.pod | 18 +++++++++++++++---
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/xCAT-client/bin/rcons b/xCAT-client/bin/rcons
index 2dcfc3acf..40cf1c8d5 100755
--- a/xCAT-client/bin/rcons
+++ b/xCAT-client/bin/rcons
@@ -1,12 +1,11 @@
 #!/bin/sh
-if [ $1 = -h  ]; then
+if [ -z "$1" ] || [ "$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
-if [ $1 = -v  ]; then
+if [ "$1" = "-v"  ]; then
     echo "Version 2.1"
     exit 0
 fi
diff --git a/xCAT-client/pods/man1/rcons.1.pod b/xCAT-client/pods/man1/rcons.1.pod
index f5ef334d4..08c8f492f 100644
--- a/xCAT-client/pods/man1/rcons.1.pod
+++ b/xCAT-client/pods/man1/rcons.1.pod
@@ -4,18 +4,30 @@ B<rcons> - remotely accesses the serial console of a node
 
 =head1 B<Synopsis>
 
-B<rcons> I<singlenode>
+B<rcons> I<singlenode> [I<conserver-host>] [B<-f>]
 
-B<rcons> [I<-h>|I<--help>|I<-v>|I<--version>]
+B<rcons> [B<-h>|B<--help>|B<-v>|B<--version>]
 
 =head1 B<Description>
 
-B<rcons> provides access to a single remote node serial console.
+B<rcons> provides access to a single remote node serial console, using the out-of-band infrastructure for the node
+(e.g. BMC, Management Module, HMC, KVM, etc.).  It uses the conserver open source package to provide one read-write and
+multiple read-only instances of the console, plus console logging.
+
+If I<conserver-host> is specified, the conserver daemon on that host will be contacted, instead of on the local host.
+
+To exit the console session, enter:  <ctrl><shift>e c .
 
 =head1 B<Options>
 
 =over 5
 
+=item B<-f>
+
+If another console for this node is already open in read-write mode, force that console into read-only (spy) mode, and
+open this console in read-write mode.  If -f is not specified, this console will be put in spy mode if another console
+is already open in read-write mode.
+
 =item B<-h>|B<--help>
 
 Print help.