xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 09:36:41 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2644 from jjohnson42/fixwin

Browse Source 
Have windows plugin pass bootparams on request
This commit is contained in:
chenglch 2017-03-15 09:36:38 +08:00 committed by GitHub
commit 4608b2dc10
1 changed files with 12 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
xCAT-server/lib/xcat/plugins/windows.pm
View File

@ -175,15 +175,10 @@ sub winshell {
} else {
mkwinlinks($node, $oshash->{$node}->[0]);
}
my $bptab = xCAT::Table->new('bootparams', -create => 1);
$bptab->setNodeAttribs(
$node,
{
kernel => "Boot/pxeboot.0",
initrd => "",
kcmdline => ""
}
);
my $bootparams = ${$request->{bootparams}};
$bootparams->{$node}->[0]->{kernel} = "Boot/pxeboot.0";
$bootparams->{$node}->[0]->{kcmdline} = "";
$bootparams->{$node}->[0]->{initrd} = "";
}
}
@ -245,7 +240,7 @@ sub mkinstall
my $node;
my $ostab = xCAT::Table->new('nodetype');
my %doneimgs;
my $bptab = xCAT::Table->new('bootparams', -create => 1);
my $bootparams = ${$request->{bootparams}};
my $hmtab = xCAT::Table->new('nodehm');
my $vpdtab = xCAT::Table->new('vpd');
my $vpdhash = $vpdtab->getNodesAttribs(\@nodes, ['uuid']);
@ -365,16 +360,11 @@ sub mkinstall
} else {
mkwinlinks($node, $ent);
}
$bootparams->{$node}->[0]->{kcmdline} = "";
$bootparams->{$node}->[0]->{initrd} = "";
if ($arch =~ /x86_64/)
{
$bptab->setNodeAttribs(
$node,
{
kernel => "Boot/pxeboot.0",
initrd => "",
kcmdline => ""
}
);
$bootparams->{$node}->[0]->{kernel} = "Boot/pxeboot.0";
} elsif ($arch =~ /x86/) {
unless (-r "$tftpdir/Boot/pxeboot32.0") {
my $origpxe;
@ -402,14 +392,7 @@ sub mkinstall
print $bootmgr $_;
}
}
$bptab->setNodeAttribs(
$node,
{
kernel => "Boot/pxeboot32.0",
initrd => "",
kcmdline => ""
}
);
$bootparams->{$node}->[0]->{kernel} = "Boot/pxeboot32.0";
}
next;
}
@ -500,14 +483,9 @@ sub mkinstall
} elsif (-r $installroot . "/$os/$arch/sources/install.wim") {
if ($arch =~ /x86/)
{
$bptab->setNodeAttribs(
$node,
{
kernel => "$winpepath" . "Boot/pxeboot.0",
initrd => "",
kcmdline => ""
}
);
$bootparams->{$node}->[0]->{kcmdline} = "";
$bootparams->{$node}->[0]->{initrd} = "";
$bootparams->{$node}->[0]->{kernel} = "Boot/pxeboot.0";
}
}
else