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

Fix esxi5 support for kernel/kcmdline set

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9389 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2011-04-22 19:09:30 +00:00
parent f205d298be
commit c908e66f62
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3966,6 +3966,8 @@ sub mknetboot {
$donetftp{$osver,$arch,$profile} = 1;
}
my $tp = "xcat/netboot/$osver/$arch/$shortprofname";
my $kernel;
my $kcmdline;
if ($osver =~ /esxi4/) {
my $bail=0;
foreach (@reqmods) {
@ -3978,7 +3980,7 @@ sub mknetboot {
return;
}
# now make <HEX> file entry stuff
my $kernel = "$tp/mboot.c32";
$kernel = "$tp/mboot.c32";
my $prepend = "$tp/vmkboot.gz";
delete $mods{"vmkboot.gz"};
my $append = " --- $tp/vmk.gz";
@ -3996,7 +3998,7 @@ sub mknetboot {
}
if (defined $bpadds->{$node}->[0]->{addkcmdline}) {
my $modules;
my $kcmdline;
$kcmdline;
($kcmdline,$modules) = split /---/,$bpadds->{$node}->[0]->{addkcmdline},2;
$kcmdline =~ s/#NODEATTRIB:([^:#]+):([^:#]+)#/$nodesubdata{$1}->{$node}->[0]->{$2}/eg;
if ($modules) {
@ -4007,8 +4009,8 @@ sub mknetboot {
$append = $prepend.$append;
}
elsif ($osver =~ /esxi5/) { #do a more straightforward thing..
my $kernel = "$tp/mboot.c32";
my $kcmdline = "-c $tp/boot.cfg.stateless";
$kernel = "$tp/mboot.c32";
$kcmdline = "-c $tp/boot.cfg.stateless";
}
$output_handler->({node=>[{name=>[$node],'_addkcmdlinehandled'=>[1]}]});