2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 17:23:08 +00:00

Merge branch 'master' of ssh://git.code.sf.net/p/xcat/xcat-core

This commit is contained in:
amy0701 2015-05-22 03:45:17 -04:00
commit b3969d4407

View File

@ -2091,92 +2091,6 @@ sub copycd
$distname =$xCAT::data::discinfo::distnames{$did};
}
}
elsif ($desc =~ /^Oracle Linux (\d)\.(\d)/)
{
unless ($distname)
{
$distname = "ol$1.$2";
}
}
elsif ($desc =~ /^RHEL-(\d)\.(\d) ([^.]*)\./) {
my $edition = "";
my $version = "$1.$2";
my %editionmap = (
"Server" => "s",
);
$edition = $editionmap{$3};
unless ($distname)
{
$distname = "rhel$edition$version";
}
}
elsif ($desc =~ /^Red Hat Enterprise Linux (\d)\.(\d)/)
{
my $edition;
my $version = "$1.$2";
if (-d "$mntpath/Server") {
$edition = "s";
} elsif (-d "$mntpath/Client") {
$edition = "c";
} elsif (-d "$mntpath/Workstation") {
$edition = "w";
} elsif (-d "$mntpath/ComputeNode") {
$edition = "cn";
}
unless ($distname)
{
$distname = "rhel$edition$version";
}
}
elsif ($desc =~ /^Final$/)
{
unless ($distname)
{
$distname = "centos5";
}
}
elsif ($desc =~ /^Fedora 8$/)
{
unless ($distname)
{
$distname = "fedora8";
}
}
elsif ($desc =~ /^CentOS-4 .*/)
{
unless ($distname)
{
$distname = "centos4";
}
}
elsif ($desc =~ /^Red Hat Enterprise Linux Client 5$/)
{
unless ($distname)
{
$distname = "rhelc5";
}
}
elsif ($desc =~ /^Red Hat Enterprise Linux Server 5$/)
{
unless ($distname)
{
$distname = "rhels5";
}
}
elsif ($desc =~ /^Scientific Linux (\d)\.(\d)/)
{
unless ($distname)
{
$distname = "SL$1.$2";
}
}
elsif ($desc =~ /^LTS$/)
{
unless ($distname)
{
$distname = "SL5";
}
}
unless ($distname)