diff --git a/xCAT-server/lib/xcat/plugins/esx.pm b/xCAT-server/lib/xcat/plugins/esx.pm index d771046f3..32c516f91 100644 --- a/xCAT-server/lib/xcat/plugins/esx.pm +++ b/xCAT-server/lib/xcat/plugins/esx.pm @@ -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; }