xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-19 21:00:24 +00:00
Code Issues Releases Wiki Activity

Pick correct pkglist/tmpl files based on the osvers

Browse Source
This commit is contained in:
cxhong
2019-06-10 16:53:05 -04:00
parent e6a6d1e5ad
commit 3ec008db60
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
xCAT-server/lib/perl/xCAT/SvrUtils.pm
View File

@ -482,7 +482,9 @@ sub getsynclistfile()
sub get_os_search_list {
my $os = shift;
my @word = split(/\./, $os);
#example: for os=rhels7.6-alternate
my ($baseos, $alter) = split(/\-/, $os);
my @word = split(/\./, $baseos);
my @list = ();
while ($word[-1] =~ /^[0-9]+$/) {
@ -713,7 +715,7 @@ sub update_tables_with_templates
my $genos = $osver;
$genos =~ s/\..*//;
if ($genos =~ /rh.*s(\d*)/) {
$genos = "rhel$1";
$genos = "rhels$1";
}
@ -935,7 +937,7 @@ sub update_tables_with_mgt_image
my $genos = $osver;
$genos =~ s/\..*//;
if ($genos =~ /rh.*s(\d*)/) {
$genos = "rhel$1";
$genos = "rhels$1";
}
#if the osver does not match the osver of MN, return
@ -1141,7 +1143,7 @@ sub update_tables_with_diskless_image
my $genos = $osver;
$genos =~ s/\..*//;
if ($genos =~ /rh.*s(\d*)/) {
$genos = "rhel$1";
$genos = "rhels$1";
}
#print "osver=$osver, arch=$arch, osname=$osname, genos=$genos, profile=$profile\n";