From 8552292c70141509a3382defaaa516ffe18ad3ef Mon Sep 17 00:00:00 2001 From: daniceexi Date: Thu, 10 Jul 2014 02:45:00 -0400 Subject: [PATCH] SL6.5 support --- perl-xCAT/xCAT/data/discinfo.pm | 5 +++-- xCAT-client/bin/genimage | 3 ++- xCAT-server/lib/xcat/plugins/anaconda.pm | 7 +++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/perl-xCAT/xCAT/data/discinfo.pm b/perl-xCAT/xCAT/data/discinfo.pm index a2468e5a2..c059fd0a4 100755 --- a/perl-xCAT/xCAT/data/discinfo.pm +++ b/perl-xCAT/xCAT/data/discinfo.pm @@ -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, diff --git a/xCAT-client/bin/genimage b/xCAT-client/bin/genimage index 0fb485fea..1bcfe4216 100755 --- a/xCAT-client/bin/genimage +++ b/xCAT-client/bin/genimage @@ -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,$_; } } diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm index 0883286e6..20085d707 100644 --- a/xCAT-server/lib/xcat/plugins/anaconda.pm +++ b/xCAT-server/lib/xcat/plugins/anaconda.pm @@ -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)