xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-31 10:06:39 +00:00
Code Issues Releases Wiki Activity

Merge pull request #63 from jjohnson42/master

Browse Source 
Further ESXi6 fixes
This commit is contained in:
Jarrod Johnson 2015-08-05 16:17:26 -04:00
commit 3c63f68aee
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4961,7 +4961,7 @@ sub mkcommonboot {
}
$append = $prepend.$append;
}
elsif ($osver =~ /esxi5/) { #do a more straightforward thing..
elsif ($osver =~ /esxi[56]/) { #do a more straightforward thing..
$kernel = "$tp/mboot.c32";
if (-r "$tftpdir/$tp/boot.cfg.$bootmode.tmpl") { #so much for straightforward..
$shortappend = "-c $tp/boot.cfg.$bootmode.$node";

2
xCAT-server/lib/xcat/plugins/xnba.pm
View File

@ -226,7 +226,7 @@ sub setstate {
print $pcfg "\n";
}
print $pcfg "IPAPPEND 2\n";
if ($kern->{kernel} =~ /esxi5/) { #Make uefi boot provisions
if ($kern->{kernel} =~ /esxi[56]/) { #Make uefi boot provisions
my $ucfg;
open($ucfg,'>',$tftpdir."/xcat/xnba/nodes/".$node.".uefi");
if ($kern->{kcmdline} =~ / xcat\/netboot/) {