xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-18 20:30:56 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1126 from chenglch/hierarchy_attrs

Browse Source 
Fix typo error about hierarchical attributes
This commit is contained in:
zet809
2016-05-17 14:34:32 +08:00
parent b3b04a4eb1 6de5c04f10
commit ad70bc8082
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/guides/admin-guides/references/man5/site.5.rst
View File

@ -380,7 +380,7 @@ site Attributes:
entries generated by 'makehosts' will put the FQDN before the PQDN(Partially
Qualified Domain Name). Otherwise, the original behavior will be performed.
heirarchicalattrs: Table attributes(e.g. postscripts, postbootscripts) that will be
hierarchicalattrs: Table attributes(e.g. postscripts, postbootscripts) that will be
included hierarchically. Attribute values for all the node's groups
will be applied to the node in the groups' order except the repeat one.

2
perl-xCAT/xCAT/Schema.pm
View File

@ -1188,7 +1188,7 @@ use xCAT::ExtTab;
"FQDNfirst: Fully Qualified Domain Name first. If set to 1/yes/enable, the /etc/hosts \n" .
" entries generated by 'makehosts' will put the FQDN before the PQDN(Partially \n" .
" Qualified Domain Name). Otherwise, the original behavior will be performed.\n\n" .
"heirarchicalattrs: Table attributes(e.g. postscripts, postbootscripts) that will be\n".
"hierarchicalattrs: Table attributes(e.g. postscripts, postbootscripts) that will be\n".
" included hierarchically. Attribute values for all the node's groups\n".
" will be applied to the node in the groups' order except the repeat one.\n\n".
" -----------------------\n" .

2
perl-xCAT/xCAT/Table.pm
View File

@ -2555,7 +2555,7 @@ sub getNodeAttribs_nosub_returnany
my $attrib;
my $result;
my @hierarchy_attrs;
my $hierarchy_field = xCAT::TableUtils->get_site_attribute("heirarchicalattrs");
my $hierarchy_field = xCAT::TableUtils->get_site_attribute("hierarchicalattrs");
if ($hierarchy_field) {
@hierarchy_attrs = split(/,/, $hierarchy_field);
}