xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-07-28 07:11:11 +00:00
Code Issues Releases Wiki Activity

Correct oversight in SLE-15 support

Browse Source
This commit is contained in:
Jarrod Johnson
2018-06-12 11:46:10 -04:00
parent f26c82b7ba
commit b600391786
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
xCAT-server/lib/xcat/plugins/sles.pm
View File

@@ -1624,6 +1624,8 @@ sub copycd
}
#parse the disc info of the os media to get the distribution, arch of the os
my $discnumber;
my $darch;
if (-r $mntpath . "/content")
{
my $dinfo;
@@ -1740,16 +1742,16 @@ sub copycd
} elsif (-r $mntpath . "/media.1/media") {
my $dinfo;
open($dinfo, $mntpath . "/media.1/media");
my $dsc = <$dinfo>;
if ($dsc =~ /x86_64/) {
$darch = "x86_64";
}
if ($dsc =~ /Installer/ and $dsc =~ /SLE-/) {
my $dsc = <$dinfo>;
if ($dsc =~ /x86_64/) {
$darch = "x86_64";
}
if ($dsc =~ /Installer/ and $dsc =~ /SLE-15/) {
$discnumber = 1;
$distname = "sle";
} elsif ($dsc =~ /SLE-/ and $dsc =~ /Packages/) {
unless ($distname) { $distname = "sle15" };
} elsif ($dsc =~ /SLE-15/ and $dsc =~ /Packages/) {
$discnumber = 2;
$distname = "sle";
unless ($distname) { $distname = "sle15" };
}
}