-Fix errors in the #TABLE:# template support in boottarget
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4133 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
parent
d77754bdc8
commit
9347368123
@ -168,11 +168,14 @@ sub mknetboot
|
||||
$kcmdline =~ s/#NODEATTRIB:([^:#]+):([^:#]+)#/$naval/;
|
||||
}
|
||||
while ($kcmdline =~ /#TABLE:([^:#]+):([^:#]+):([^:#]+)#/) {
|
||||
my $tabname = $1;
|
||||
my $keyname = $2;
|
||||
my $colname = $3;
|
||||
if ($2 =~ /THISNODE/ or $2 =~ /\$NODE/) {
|
||||
my $natab = xCAT::Table->new($1);
|
||||
my $naent = $natab->getNodeAttribs($node,[$3]);
|
||||
my $naval = $naent->{$3};
|
||||
$kcmdline =~ s/#NODEATTRIB:([^:#]+):([^:#]+):([^:#]+)#/$naval/;
|
||||
my $natab = xCAT::Table->new($tabname);
|
||||
my $naent = $natab->getNodeAttribs($node,[$colname]);
|
||||
my $naval = $naent->{$colname};
|
||||
$kcmdline =~ s/#TABLE:([^:#]+):([^:#]+):([^:#]+)#/$naval/;
|
||||
} else {
|
||||
my $msg = "Table key of $2 not yet supported by boottarget mini-template";
|
||||
$callback->({
|
||||
|
Loading…
Reference in New Issue
Block a user