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

feat(copycds): publish the grub2 boot loader of the installation media

Browse Source 
riscv64 nodes boot through UEFI and grub2 only, and xCAT builds no boot
loader: /tftpboot/boot/grub2/grub2.riscv64 has to come from the xcat-dep
grub2-xcat package or be copied by hand, which is a step an admin only
finds out about when a node times out in firmware.

The EL riscv64 media carry exactly that image as EFI/BOOT/grubriscv64.efi,
so copycd publishes it after a successful media copy, and says so. An
image the management node already has is never replaced, and the media of
every other architecture is untouched.
This commit is contained in:
Vinícius Ferrão
2026-08-21 00:55:25 -03:00
parent ba352c01f6
commit f8b9fd8489
1 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xCAT-server/lib/xcat/plugins/anaconda.pm
+31
View File
@@ -2091,6 +2091,36 @@ erver, if so, stop it first and try again" ],
}
}
# EL media that carry the grub2 UEFI image of an architecture xCAT cannot build a
# boot loader for. copycd publishes it so those nodes can net boot without any
# further step; grub2-xcat installs the same image where it is available.
my %MEDIA_GRUB2_LOADERS = (riscv64 => 'grubriscv64.efi');
# Publish the grub2 UEFI image of the media under $tftpdir/boot/grub2, unless the
# management node already has one. Returns the path written, or undef.
sub _install_media_grub2_loader {
my ($path, $arch, $callback) = @_;
my $image = $MEDIA_GRUB2_LOADERS{$arch};
return unless $image;
my $source = "$path/EFI/BOOT/$image";
return unless -r $source;
my $tftpdir = xCAT::TableUtils->getTftpDir();
return unless $tftpdir;
my $target = "$tftpdir/boot/grub2/grub2.$arch";
return if -e $target;
mkpath("$tftpdir/boot/grub2");
unless (copy($source, $target)) {
$callback->({ data => "Could not install $target from the media: $!" }) if $callback;
return;
}
chmod 0644, $target;
$callback->({ data => "Installed $target from the media" }) if $callback;
return $target;
}
sub copycd
{
my $request = shift;
@@ -2488,6 +2518,7 @@ sub copycd
else
{
$callback->({ data => "Media copy operation successful" });
_install_media_grub2_loader($path, $arch, $callback);
my @ret = xCAT::SvrUtils->update_osdistro_table($distname, $arch, $path, $osdistroname);
if ($ret[0] != 0) {
$callback->({ data => "Error when updating the osdistro tables: " . $ret[1] });