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

defect 3317678: fix the issue that cannot get correct nodestate

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9835 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
daniceexi
2011-06-17 08:44:01 +00:00
parent 7641f19168
commit 57b94e7f75
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -503,7 +503,7 @@ sub makescript
elsif ($os =~ /aix.*/) { $platform = "aix"; }
elsif ($os =~ /AIX.*/) { $platform = "AIX"; }
}
if (($nodesetstate) && ($nodesetstate eq "netboot"))
if (($nodesetstate) && ($nodesetstate eq "netboot" || $nodesetstate eq "statelite"))
{
$stat = "netboot";
}
@@ -588,16 +588,16 @@ sub makescript
}
}
}
else
if (!$syncfile)
{
my $stat = "install";
if (($nodesetstate) && ($nodesetstate eq "netboot")) {
if (($nodesetstate) && ($nodesetstate eq "netboot" || $nodesetstate eq "statelite")) {
$stat = "netboot";
}
$syncfile =
xCAT::SvrUtils->getsynclistfile(undef, $os, $arch, $profile, $stat);
}
if (!defined($syncfile))
if (!$syncfile)
{
push @scriptd, "NOSYNCFILES=1\n";
push @scriptd, "export NOSYNCFILES\n";

7
xCAT-server/lib/perl/xCAT/SvrUtils.pm
View File

@@ -149,6 +149,13 @@ sub get_nodeset_state
$state = $a[0];
}
if ($boottype eq "xnba")
{
require xCAT_plugin::xnba;
my $tmp = xCAT_plugin::xnba::getstate($node);
my @a = split(' ', $tmp);
$state = $a[0];
}
elsif ($boottype eq "yaboot")
{
require xCAT_plugin::yaboot;