From 3b50ed90368e78b4884aec996bc599f6daa4cd05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20Ferr=C3=A3o?= <2031761+viniciusferrao@users.noreply.github.com> Date: Tue, 13 Oct 2026 11:11:14 -0300 Subject: [PATCH] refactor(boot): expose the Genesis file selector --- perl-xCAT/xCAT/BootUtils.pm | 6 +++++- xCAT-server/lib/xcat/plugins/anaconda.pm | 4 ++-- xCAT-server/lib/xcat/plugins/sles.pm | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/perl-xCAT/xCAT/BootUtils.pm b/perl-xCAT/xCAT/BootUtils.pm index 6753d0914..bfbbe1775 100644 --- a/perl-xCAT/xCAT/BootUtils.pm +++ b/perl-xCAT/xCAT/BootUtils.pm @@ -7,9 +7,13 @@ use Exporter qw(import); use xCAT::Utils; -our @EXPORT_OK = qw(_find_genesis_boot_files); +our @EXPORT_OK = qw(find_genesis_boot_files _find_genesis_boot_files); sub _find_genesis_boot_files { + return find_genesis_boot_files(@_); +} + +sub find_genesis_boot_files { my ($tftpdir, $arch) = @_; return unless defined($arch) && $arch =~ /\A[A-Za-z0-9_]+\z/; diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm index b3e055041..0103963ad 100644 --- a/xCAT-server/lib/xcat/plugins/anaconda.pm +++ b/xCAT-server/lib/xcat/plugins/anaconda.pm @@ -12,7 +12,7 @@ use Thread qw(yield); use POSIX qw(WNOHANG nice); use xCAT::Table; use xCAT::Utils; -use xCAT::BootUtils qw(_find_genesis_boot_files); +use xCAT::BootUtils qw(find_genesis_boot_files _find_genesis_boot_files); use xCAT::TableUtils; use xCAT::NetworkUtils; use xCAT::MsgUtils; @@ -1987,7 +1987,7 @@ sub mksysclone =cut my $ramdisk_size = 200000; - my ($kernpath, $initrdpath) = _find_genesis_boot_files($tftpdir, $arch); + my ($kernpath, $initrdpath) = find_genesis_boot_files($tftpdir, $arch); if (defined($kernpath) && defined($initrdpath)) { diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm index bd9c001cc..50267227a 100644 --- a/xCAT-server/lib/xcat/plugins/sles.pm +++ b/xCAT-server/lib/xcat/plugins/sles.pm @@ -11,7 +11,7 @@ use Sys::Syslog; use File::Temp qw/tempdir/; use xCAT::Table; use xCAT::Utils; -use xCAT::BootUtils qw(_find_genesis_boot_files); +use xCAT::BootUtils qw(find_genesis_boot_files _find_genesis_boot_files); use xCAT::TableUtils; use xCAT::NetworkUtils; use xCAT::SvrUtils; @@ -1452,7 +1452,7 @@ sub mksysclone # copy kernel and initrd from image dir to /tftpboot my $ramdisk_size = 200000; my ($genesis_kernel, $genesis_initrd) = - _find_genesis_boot_files($tftpdir, $arch); + find_genesis_boot_files($tftpdir, $arch); if (defined($genesis_kernel) && defined($genesis_initrd)) {