arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SL6.5 support

Browse Source
This commit is contained in:
daniceexi 2014-07-10 02:45:00 -04:00
parent 014c69c7b9
commit 8552292c70
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
perl-xCAT/xCAT/data/discinfo.pm
View File

@ -92,8 +92,9 @@ require Exporter;
"1194512327.501046" => "rhas4.6",
"1241464993.830723" => "rhas4.8", #x86-64
"1273608367.051780" => "SL5.5", #x86_64 DVD ISO
"1299104542.844706" => "SL6", #x86_64 DVD ISO
"1273608367.051780" => "SL5.5", #x86_64 DVD ISO
"1299104542.844706" => "SL6", #x86_64 DVD ISO
"1390839789.062069" => "SL6.5", #x86_64 DVD ISO Install
);
my %numdiscs = (
"1156364963.862322" => 4,

3
xCAT-client/bin/genimage
View File

@ -176,7 +176,8 @@ if ((!$imagename) && (!$os)){
my @dircontents = `ls $installdir`;
chomp(@dircontents);
foreach (@dircontents) {
if($_ =~ /(rhel|fedora|sl|centos|suse)/){
# SL matches Scientific Linux, sl matches sles amd sled
if($_ =~ /(rhel|fedora|SL|centos|sl|suse)/){
push @oses,$_;
}
}

7
xCAT-server/lib/xcat/plugins/anaconda.pm
View File

@ -2196,6 +2196,13 @@ sub copycd
$distname = "rhels5";
}
}
elsif ($desc =~ /^Scientific Linux (\d)\.(\d)/)
{
unless ($distname)
{
$distname = "SL$1.$2";
}
}
elsif ($desc =~ /^LTS$/)
{
unless ($distname)