From 6bdfc2044be5bc11d952d13816d842d0fd242590 Mon Sep 17 00:00:00 2001 From: Victor Hu Date: Fri, 16 Sep 2016 19:03:21 -0400 Subject: [PATCH] Fixed based on review comments --- docs/source/guides/admin-guides/references/man5/chain.5.rst | 2 +- docs/source/guides/admin-guides/references/man7/group.7.rst | 2 +- docs/source/guides/admin-guides/references/man7/node.7.rst | 2 +- perl-xCAT/xCAT/Schema.pm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man5/chain.5.rst b/docs/source/guides/admin-guides/references/man5/chain.5.rst index d339f5760..37ac50f22 100644 --- a/docs/source/guides/admin-guides/references/man5/chain.5.rst +++ b/docs/source/guides/admin-guides/references/man5/chain.5.rst @@ -56,7 +56,7 @@ chain Attributes: \ **chain**\ - A comma-delimited chain of actions to be performed automatically when this node is discovered for the first time. (xCAT and the DHCP server does not recognize the MAC address of the node and xCAT initializes the discovery process. The last step in this process is to run the operations listed in the chain attribute, one by one. Valid values: boot, runcmd=, runimage=, shell, standby. Example, to have the genesis kernel pause, chain=shell. + A comma-delimited chain of actions to be performed automatically when this node is discovered for the first time. (xCAT and the DHCP server do not recognize the MAC address of the node when xCAT initializes the discovery process.) The last step in this process is to run the operations listed in the chain attribute, one by one. Valid values: boot, runcmd=, runimage=, shell, standby. For example, to have the genesis kernel pause to the shell, use chain=shell. diff --git a/docs/source/guides/admin-guides/references/man7/group.7.rst b/docs/source/guides/admin-guides/references/man7/group.7.rst index d5fd8a202..25a2486a3 100644 --- a/docs/source/guides/admin-guides/references/man7/group.7.rst +++ b/docs/source/guides/admin-guides/references/man7/group.7.rst @@ -147,7 +147,7 @@ group Attributes: \ **chain**\ (chain.chain) - A comma-delimited chain of actions to be performed automatically when this node is discovered for the first time. (xCAT and the DHCP server does not recognize the MAC address of the node and xCAT initializes the discovery process. The last step in this process is to run the operations listed in the chain attribute, one by one. Valid values: boot, runcmd=, runimage=, shell, standby. Example, to have the genesis kernel pause, chain=shell. + A comma-delimited chain of actions to be performed automatically when this node is discovered for the first time. (xCAT and the DHCP server do not recognize the MAC address of the node when xCAT initializes the discovery process.) The last step in this process is to run the operations listed in the chain attribute, one by one. Valid values: boot, runcmd=, runimage=, shell, standby. For example, to have the genesis kernel pause to the shell, use chain=shell. diff --git a/docs/source/guides/admin-guides/references/man7/node.7.rst b/docs/source/guides/admin-guides/references/man7/node.7.rst index a0838cec0..52581902c 100644 --- a/docs/source/guides/admin-guides/references/man7/node.7.rst +++ b/docs/source/guides/admin-guides/references/man7/node.7.rst @@ -159,7 +159,7 @@ node Attributes: \ **chain**\ (chain.chain) - A comma-delimited chain of actions to be performed automatically when this node is discovered for the first time. (xCAT and the DHCP server does not recognize the MAC address of the node and xCAT initializes the discovery process. The last step in this process is to run the operations listed in the chain attribute, one by one. Valid values: boot, runcmd=, runimage=, shell, standby. Example, to have the genesis kernel pause, chain=shell. + A comma-delimited chain of actions to be performed automatically when this node is discovered for the first time. (xCAT and the DHCP server do not recognize the MAC address of the node when xCAT initializes the discovery process.) The last step in this process is to run the operations listed in the chain attribute, one by one. Valid values: boot, runcmd=, runimage=, shell, standby. For example, to have the genesis kernel pause to the shell, use chain=shell. diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm index f7d3a9f38..ebe64b87d 100755 --- a/perl-xCAT/xCAT/Schema.pm +++ b/perl-xCAT/xCAT/Schema.pm @@ -358,7 +358,7 @@ passed as argument rather than by table value', node => 'The node name or group name.', currstate => 'The current or next chain step to be executed on this node by xCAT-genesis. Set by xCAT during node discovery or as a result of nodeset.', currchain => 'The chain steps still left to do for this node. This attribute will be automatically adjusted by xCAT while xCAT-genesis is running on the node (either during node discovery or a special operation like firmware update). During node discovery, this attribute is initialized from the chain attribute and updated as the chain steps are executed.', - chain => 'A comma-delimited chain of actions to be performed automatically when this node is discovered for the first time. (xCAT and the DHCP server does not recognize the MAC address of the node and xCAT initializes the discovery process. The last step in this process is to run the operations listed in the chain attribute, one by one. Valid values: boot, runcmd=, runimage=, shell, standby. Example, to have the genesis kernel pause, chain=shell.', + chain => 'A comma-delimited chain of actions to be performed automatically when this node is discovered for the first time. (xCAT and the DHCP server do not recognize the MAC address of the node when xCAT initializes the discovery process.) The last step in this process is to run the operations listed in the chain attribute, one by one. Valid values: boot, runcmd=, runimage=, shell, standby. For example, to have the genesis kernel pause to the shell, use chain=shell.', ondiscover => 'This attribute is currently not used by xCAT. The "nodediscover" operation is always done during node discovery.', comments => 'Any user-written notes.', disable => "Set to 'yes' or '1' to comment out this row.",