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

copycds supports sles12

Browse Source
This commit is contained in:
ligc 2013-10-15 15:36:23 +08:00
parent 99e6319765
commit 57c53ba533
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1645,6 +1645,9 @@ sub copycd
if (not $darch and m/^BASEARCHS\s+(\S+)/) {
$darch = $1;
}
if (not $darch and m/^REPOID.*\/(\S+)/) {
$darch = $1;
}
}
close($dinfo);
unless ($darch)
@ -1672,7 +1675,7 @@ sub copycd
my $prod = <$mfile>;
close($mfile);
if ($prod =~ m/SUSE-Linux-Enterprise-Server/ || $prod =~ m/SUSE-Linux-Enterprise-Software-Development-Kit/)
if ($prod =~ m/SUSE-Linux-Enterprise-Server/ || $prod =~ m/SUSE-Linux-Enterprise-Software-Development-Kit/ || $prod =~ m/SLES/)
{
if (-f "$mntpath/content") {
my $content;
@ -1685,6 +1688,12 @@ sub copycd
$detdistname = "sles".$verpair[1];
unless ($distname) { $distname = $detdistname; }
}
unless ($distname) {
if (/^DISTRO/) {
$_ =~ /sles:(\d+),/;
$distname = "sles".$1;
}
}
}
} else {
my @parts = split /\s+/, $prod;