2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-11-19 08:52:15 +00:00

fix(boot): stop node-template expansion on unsupported keys

This commit is contained in:
Vinícius Ferrão
2026-10-22 20:55:56 -03:00
parent 8393732971
commit bb8bc944dd
4 changed files with 14 additions and 4 deletions
+1
View File
@@ -62,6 +62,7 @@ sub expand_node_template {
$text =~ s/#TABLE:([^:#]+):([^:#]+):([^:#]+)#/$value/;
} else {
$on_error->("Table key of $key not yet supported by boottarget mini-template");
return;
}
}
return $text;
+6 -1
View File
@@ -159,10 +159,15 @@ sub mknetboot
$kcmdline = $tent->{kcmdline};
#TODO: big todo, cheap and rapid, but should be more like esx.pm implementation, i.e. more scalable
my $template_error;
$kcmdline = xCAT::BootUtils::expand_node_template(
$node, $kcmdline,
sub { $callback->({error => [$_[0]], errorcode => [1]}); }
sub { $template_error = shift; }
);
if (defined($template_error)) {
xCAT::MsgUtils->report_node_error($callback, $node, $template_error);
next;
}
if ($initrd eq '') {
$bptab->setNodeAttribs(
+4 -2
View File
@@ -118,10 +118,12 @@ sub setstate {
$kcmdlinehack = xCAT::BootUtils::volatile_addkcmdline($kcmdlinehack);
my $template_error;
$kcmdlinehack = xCAT::BootUtils::expand_node_template(
$node, $kcmdlinehack,
sub { $::PXE_callback->({error => [$_[0]], errorcode => [1]}); }
sub { $template_error = shift; }
);
return (1, $template_error) if defined($template_error);
#$kern->{kcmdline} .= " ".$kern->{addkcmdline};
@@ -514,7 +516,7 @@ sub process_request {
($rc, $errstr) = setstate($_, \%bphash, \%chainhash, \%machash, \%nthash, $tftpdir, $linuximghash);
if ($rc) {
$response{node}->[0]->{errorcode}->[0] = $rc;
$response{node}->[0]->{errorc}->[0] = $errstr;
$response{node}->[0]->{error}->[0] = $errstr;
$::PXE_callback->(\%response);
}
}
+3 -1
View File
@@ -203,10 +203,12 @@ sub setstate {
$kcmdlinehack = xCAT::BootUtils::volatile_addkcmdline($kcmdlinehack);
my $template_error;
$kcmdlinehack = xCAT::BootUtils::expand_node_template(
$node, $kcmdlinehack,
sub { $::XNBA_callback->({error => [$_[0]], errorcode => [1]}); }
sub { $template_error = shift; }
);
return (1, $template_error) if defined($template_error);
#$kern->{kcmdline} .= " ".$kern->{addkcmdline};
$kern->{kcmdline} .= " " . $kcmdlinehack;