From 37c604a69d70a9f19ebd78bc33e2e2bebcefcadc Mon Sep 17 00:00:00 2001
From: linggao <linggao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 29 Mar 2012 22:22:32 +0000
Subject: [PATCH] minor fix for getNodesetStates in pxe and yaboot

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12065 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/pxe.pm    | 4 ++--
 xCAT-server/lib/xcat/plugins/yaboot.pm | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/pxe.pm b/xCAT-server/lib/xcat/plugins/pxe.pm
index 53156346e..280bc1c41 100644
--- a/xCAT-server/lib/xcat/plugins/pxe.pm
+++ b/xCAT-server/lib/xcat/plugins/pxe.pm
@@ -42,7 +42,7 @@ sub check_dhcp {
 }
 
 sub _slow_get_tftpdir { #make up for paths where tftpdir is not passed in
-    my $node=shift;
+    my $node = shift;
     my $nrtab = xCAT::Table->new('noderes',-create=>0); #in order to detect per-node tftp directories
     unless ($nrtab) { return $globaltftpdir; }
     my $ent = $nrtab->getNodeAttribs($node,["tftpdir"]);
@@ -634,7 +634,7 @@ sub getNodesetStates {
       } else {
          $tftpdir = $globaltftpdir;
       }
-      my $tmp=getstate($node);
+      my $tmp=getstate($node, $tftpdir);
       my @a=split(' ', $tmp);
       $stat = $a[0];
       if (exists($hashref->{$stat})) {
diff --git a/xCAT-server/lib/xcat/plugins/yaboot.pm b/xCAT-server/lib/xcat/plugins/yaboot.pm
index 21155cb7f..1a5aba26e 100644
--- a/xCAT-server/lib/xcat/plugins/yaboot.pm
+++ b/xCAT-server/lib/xcat/plugins/yaboot.pm
@@ -607,7 +607,7 @@ sub getNodesetStates {
       } else {
          $tftpdir = $globaltftpdir;
       }
-      my $tmp=getstate($node);
+      my $tmp=getstate($node, $tftpdir);
       my @a=split(' ', $tmp);
       $stat = $a[0];
       if (exists($hashref->{$stat})) {