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

refactor(template): use shared Ubuntu version comparison

Browse Source
This commit is contained in:
Vinícius Ferrão
2026-08-24 03:20:02 -03:00
parent 1e4242174f
commit 6e5dac5176
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xCAT-server/lib/perl/xCAT/Template.pm
+10 -5
View File
@@ -1786,18 +1786,23 @@ sub ubuntu_subiquity_otherpkg_sources
sub ubuntu_subiquity_uses_deb822_sources
{
my ($media_dir) = @_;
my $release = ubuntu_subiquity_release($media_dir);
return 1 if $release =~ m{ubuntu([2-9][4-9]|[3-9][0-9])\.\d+};
return 0;
return ubuntu_subiquity_release_at_least( $media_dir, '24.0' );
}
sub ubuntu_subiquity_uses_generated_cdrom_source
{
my ($media_dir) = @_;
return ubuntu_subiquity_release_at_least( $media_dir, '26.0' );
}
sub ubuntu_subiquity_release_at_least
{
my ( $media_dir, $minimum ) = @_;
my $release = ubuntu_subiquity_release($media_dir);
return 1 if $release =~ m{ubuntu([2-9][6-9]|[3-9][0-9])\.\d+};
foreach my $version ( $release =~ m{ubuntu(\d{2}\.\d+)}g ) {
return 1 if xCAT::Utils->version_cmp( $version, $minimum ) >= 0;
}
return 0;
}