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

defect 3605. correct the nodesetstate value.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16757 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jjhua 2013-06-26 06:58:53 +00:00
parent 33127b6f2d
commit 1e42465195
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -407,7 +407,7 @@ sub makescript {
#print "nodesetstate:$nodesetstate\n";
## OSPKGDIR export
# for #OSIMAGE_VARS_EXPORT#
if (!$nodesetstate) { $nodesetstate = $nodes_setstate_hash->{$node}; }
if (!$nodesetstate || ( defined($nodes_setstate_hash) && $nodes_setstate_hash->{$node}) ) { $nodesetstate = $nodes_setstate_hash->{$node}; }
#print "nodesetstate:$nodesetstate\n";
#my $et = $typehash->{$node};
@ -1430,7 +1430,8 @@ sub getNodesSetState
my ($ret, $msg)=xCAT::SvrUtils->getNodesetStates($nodes, $nsh);
foreach my $state (keys %$nsh) {
my $ns = $nsh->{$state};
%res = map {$_ => $state} @$ns;
my %result = map {$_ => $state} @$ns;
%res = (%result, %res);
}
return \%res;
}