Merge pull request #936 from gurevichmark/grub2_shell

Fix nodeset command for shell and shutdown options and fix usage and man page

docs/source/guides/admin-guides/references/man8/nodeset.8.rst

@@ -19,11 +19,11 @@ Name
 ****************
 
 
-\ **nodeset**\  [\ *noderange*\ ] [\ **boot**\  | \ **stat**\  | \ **iscsiboot**\  | \ **offline**\  | \ **runcmd=bmcsetup**\  | \ **osimage**\ = \ *imagename*\  | \ **shell**\  | \ **shutdown**\ ]
+\ **nodeset**\  \ *noderange*\  [\ **boot**\  | \ **stat**\  | \ **iscsiboot**\  | \ **offline**\  | \ **runcmd=bmcsetup**\  | \ **osimage**\ [=\ *imagename*\ ] | \ **shell**\  | \ **shutdown**\ ]
 
-\ **nodeset**\  \ *noderange*\  \ **osimage=**\  \ *imagename*\  [\ **-**\ **-noupdateinitrd**\ ] [\ **-**\ **-ignorekernelchk**\ ]
+\ **nodeset**\  \ *noderange*\  \ **osimage**\ [=\ *imagename*\ ] [\ **-**\ **-noupdateinitrd**\ ] [\ **-**\ **-ignorekernelchk**\ ]
 
-\ **nodeset**\  \ *noderange*\  \ **runimage=**\  \ *task*\ 
+\ **nodeset**\  \ *noderange*\  \ **runimage=**\ \ *task*\ 
 
 \ **nodeset**\  [\ **-h | -**\ **-help | -v | -**\ **-version**\ ]
 
@@ -74,7 +74,7 @@ A user can supply their own scripts to be run on the mn or on the service node (
  
 
 
-\ **osimage | osimage=<imagename**\ >
+\ **osimage | osimage=**\ \ *imagename*\ 
  
  Prepare server for installing a node using the specified os image. The os image is defined in the \ *osimage*\  table and \ *linuximage*\  table. If the <imagename> is omitted, the os image name will be obtained from \ *nodetype.provmethod*\  for the node.
  

perl-xCAT/xCAT/Usage.pm

@@ -459,7 +459,7 @@ Options:
 "Usage:
    Common:
       nodeset [-h|--help|-v|--version]
-      nodeset <noderange> [shell|boot|runcmd=bmcsetup|iscsiboot|osimage[=<imagename>]|offline]",
+      nodeset <noderange> [shell|boot|runcmd=bmcsetup|iscsiboot|osimage[=<imagename>]|offline|shutdown|stat]",
   "rmflexnode" =>
 "Usage:
     rmflexnode [-h|--help|-v|--version]

xCAT-client/pods/man8/nodeset.8.pod

@@ -4,11 +4,11 @@ B<nodeset> - set the boot state for a noderange
 
 =head1 B<Synopsis>
 
-B<nodeset> [I<noderange>] [B<boot> | B<stat> | B<iscsiboot> | B<offline> | B<runcmd=bmcsetup> | B<osimage>= I<imagename> | B<shell> | B<shutdown>]
+B<nodeset> I<noderange> [B<boot> | B<stat> | B<iscsiboot> | B<offline> | B<runcmd=bmcsetup> | B<osimage>[=I<imagename>] | B<shell> | B<shutdown>]
 
-B<nodeset> I<noderange> B<osimage=> I<imagename> [B<--noupdateinitrd>] [B<--ignorekernelchk>]
+B<nodeset> I<noderange> B<osimage>[=I<imagename>] [B<--noupdateinitrd>] [B<--ignorekernelchk>]
 
-B<nodeset> I<noderange> B<runimage=> I<task>
+B<nodeset> I<noderange> B<runimage=>I<task>
 
 B<nodeset> [B<-h>|B<--help>|B<-v>|B<--version>]
 
@@ -49,7 +49,7 @@ Instruct network boot loader to be skipped, generally meaning boot to hard disk
 
 Cleanup the current pxe/tftp boot configuration files for the nodes requested
 
-=item B<osimage>|B<osimage=<imagename>>
+=item B<osimage>|B<osimage=>I<imagename>
 
 Prepare server for installing a node using the specified os image. The os image is defined in the I<osimage> table and I<linuximage> table. If the <imagename> is omitted, the os image name will be obtained from I<nodetype.provmethod> for the node.