xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-09-04 20:17:55 +00:00
Code Issues Releases Wiki Activity

fix(debian): nodes with no xcatmaster get no boot config at all

Browse Source 
The subiquity path resolved $instserver with getipaddr and `next`ed the node
when that returned nothing. For a node whose noderes.xcatmaster is unset,
$instserver is the literal '!myipfn!' -- a placeholder that pxe.pm:176 and
grub2.pm:129 substitute with my_ip_facing($node) when they write the boot
config. Resolving it as a name always fails, so those nodes went from a working
numeric nfsroot to no boot config and a "Could not resolve the install server"
error.

noderes.5.rst:125 documents an unset xcatmaster as supported, and anaconda.pm
and sles.pm both already guard the placeholder with
`unless ($instserver eq '!myipfn!')`.

Exempt the placeholder, keeping the guard for a real name that does not
resolve -- klibc's nfsmount still cannot resolve one of those, which is what
the original commit was for.

The decision moves into subiquity_nfsroot_server(), taking the resolver as an
optional argument, so it can be driven directly instead of through a routine
that needs a management node.

Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>
This commit is contained in:
Daniel Hilst
2026-09-01 18:47:45 -03:00
parent 2558e84736
commit 5ce5edf24b
1 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xCAT-server/lib/xcat/plugins/debian.pm
+34 -2
View File
@@ -509,6 +509,37 @@ sub copycd
#-------------------------------------------------------------------------------
=head3 subiquity_nfsroot_server
Resolve the install server to the address casper's klibc nfsmount needs.
'!myipfn!' is a placeholder, not a name: pxe.pm and grub2.pm substitute it with
my_ip_facing($node) when they write the boot config, so it is already an address by the
time klibc sees it. Resolving it here would only ever fail, and failing would drop a node
whose noderes.xcatmaster is simply unset -- which noderes.5.rst documents as supported.
anaconda.pm and sles.pm guard the same placeholder the same way.
Arguments:
$instserver the install server name, address, or the '!myipfn!' placeholder
$resolver optional coderef, for tests; defaults to NetworkUtils::getipaddr
Returns:
the value to put in nfsroot, or undef when a real name does not resolve
=cut
#-------------------------------------------------------------------------------
sub subiquity_nfsroot_server {
my ($instserver, $resolver) = @_;
return undef unless defined($instserver) && length($instserver);
return $instserver if $instserver eq '!myipfn!';
$resolver ||= sub { xCAT::NetworkUtils->getipaddr($_[0]) };
return $resolver->($instserver);
}
#-------------------------------------------------------------------------------
=head3 subiquity_kcmdline
Build the kernel command line for a Subiquity (Ubuntu live installer) diskful install.
@@ -1034,8 +1065,9 @@ sub mkinstall {
if (using_subiquity($os,$tmplfile)) {
# Fail here rather than handing casper a name: klibc's nfsmount cannot resolve
# one, so the node would panic "can't parse IP address" at boot, on the node,
# with nothing said on the management node.
my $nfsip = xCAT::NetworkUtils->getipaddr($instserver);
# with nothing said on the management node. '!myipfn!' is exempt -- pxe.pm and
# grub2.pm turn it into an address when they write the boot config.
my $nfsip = subiquity_nfsroot_server($instserver);
unless ($nfsip) {
xCAT::MsgUtils->report_node_error($callback, $node,
"Could not resolve the install server '$instserver' to an address. The Ubuntu live installer mounts its root with klibc nfsmount, which cannot resolve names, so nfsroot must be an address.");