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

Fix problem where esxi failed to honor '-n' argument in copycds

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14076 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso
2012-10-22 15:21:37 +00:00
parent 8eae49b6d6
commit 7606207542
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
xCAT-server/lib/xcat/plugins/esx.pm
View File

@@ -4124,7 +4124,7 @@ sub copycd {
}
close(LINE);
if ($product and $version) {
$distname = $product.$version;
unless ($distname) { $distname = $product.$version; }
$found = 1;
}
} elsif (-r $path . "/README" and -r $path . "/open_source_licenses.txt" and -d $path . "/VMware") { #Candidate to be ESX 3.5
@@ -4133,7 +4133,7 @@ sub copycd {
if (/VMware ESX Server 3.5\s*$/) {
$darch ='x86';
$arch = 'x86';
$distname = 'esx3.5';
unless ($distname) { $distname = 'esx3.5'; }
$found = 1;
last;
}
@@ -4149,10 +4149,12 @@ sub copycd {
chomp($line);
if($line =~ /VMware ESXi(?: version)? 4\.(\d+)/){
$darch = "x86_64";
unless ($distname) {
$distname = "esxi4";
if ($1) {
$distname .= '.'.$1;
}
}
$found = 1;
if( $arch and $arch ne $darch){
xCAT::SvrUtils::sendmsg([1, "Requested distribution architecture $arch, but media is $darch"], $output_handler);
@@ -4173,7 +4175,7 @@ sub copycd {
if (/ThinESX Installer/) {
$darch = 'x86';
$arch='x86';
$distname='esxi3.5';
unless ($distname) { $distname='esxi3.5'; }
$found=1;
last;
}
@@ -4185,14 +4187,14 @@ sub copycd {
if (/VMware ESXi 5\.0/) {
$darch="x86_64";
$arch="x86_64";
$distname='esxi5';
unless ($distname) { $distname='esxi5'; }
$found=1;
last;
}
if (/VMware ESXi 5\.1/) {
$darch="x86_64";
$arch="x86_64";
$distname='esxi5.1';
unless ($distname) { $distname='esxi5.1'; }
$found=1;
last;
}