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

fix for bug 3007239: setbootfromnet is called for diskful nodes

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6237 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
ligc 2010-05-26 09:47:31 +00:00
parent baa81721b9
commit 5372010293
1 changed files with 39 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
xCAT-server/lib/perl/xCAT/Postage.pm
View File

@ -369,26 +369,47 @@ sub makescript {
push @scriptd, "export NOSYNCFILES\n";
}
my $isdiskless = 0;
my $setbootfromnet = 0;
if (($arch eq "ppc64") || ($os =~ /aix.*/i))
{
if (($provmethod) && ($provmethod ne "install")) {
# on Linux, the provmethod can be install,netboot or statelite,
# on AIX, the provmethod can be null or diskless image name
(my $ip,my $mask,my $gw) = net_parms($node);
if (!$ip || !$mask || !$gw)
{
xCAT::MsgUtils->message('S',"Unable to determine IP, netmask or gateway for $node, can not set the node to boot from network");
}
else
{
$setbootfromnet = 1;
push @scriptd, "NETMASK=$mask\n";
push @scriptd, "export NETMASK\n";
push @scriptd, "GATEWAY=$gw\n";
push @scriptd, "export GATEWAY\n";
}
}
# on Linux, the provmethod can be install,netboot or statelite,
# on AIX, the provmethod can be null or image name
#this is for Linux
if (($provmethod) && (($provmethod eq "netboot") || ($provmethod eq "statelite"))) {
$isdiskless = 1;
}
if (($os =~ /aix.*/i) && ($provmethod) && ($provmethod ne "install") && ($provmethod ne "netboot") && ($provmethod ne "statelite")) {
my $nimtype;
my $nimimagetab=xCAT::Table->new('nimimage', -create=>1);
if ($nimimagetab) {
(my $ref) = $nimimagetab->getAttribs({imagename => $provmethod}, 'nimtype');
if ($ref) {
$nimtype = $ref->{'nimtype'}
}
}
if ($nimtype eq 'diskless')
{
$isdiskless = 1;
}
}
if ($isdiskless)
{
(my $ip,my $mask,my $gw) = net_parms($node);
if (!$ip || !$mask || !$gw)
{
xCAT::MsgUtils->message('S',"Unable to determine IP, netmask or gateway for $node, can not set the node to boot from network");
}
else
{
$setbootfromnet = 1;
push @scriptd, "NETMASK=$mask\n";
push @scriptd, "export NETMASK\n";
push @scriptd, "GATEWAY=$gw\n";
push @scriptd, "export GATEWAY\n";
}
}
}
###Please do not remove or modify this line of code!!! xcatdsklspost depends on it
push @scriptd, "# postscripts-start-here\n";
@ -523,7 +544,7 @@ sub net_parms {
my $net = $_->{'net'};
my $mask =$_->{'mask'};
my $gw = $_->{'gateway'};
if (xCAT::NetworkUtils->ishostinsubnet($ip, $mask, $gw)) {
if (xCAT::NetworkUtils->ishostinsubnet($ip, $mask, $net)) {
return ($ip,$mask,$gw);
}
}