From 8829ed63558ef7045c675d8751bcac2e7495d4b6 Mon Sep 17 00:00:00 2001
From: daniceexi <daniceexi@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 24 Feb 2010 09:14:25 +0000
Subject: [PATCH] defect 2948354: use the getInstallDir and getTftpDir to get
 install and tftp dirs

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5282 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/toolscenter.pm | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/toolscenter.pm b/xCAT-server/lib/xcat/plugins/toolscenter.pm
index cda97bcc1..05deda131 100644
--- a/xCAT-server/lib/xcat/plugins/toolscenter.pm
+++ b/xCAT-server/lib/xcat/plugins/toolscenter.pm
@@ -130,24 +130,20 @@ sub mknetboot
     my $req      = shift;
     my $callback = shift;
     my $doreq    = shift;
-    my $tftpdir  = "/tftpboot";
     my $nodes    = @{$request->{node}};
     my @args     = @{$req->{arg}};
     my @nodes    = @{$req->{node}};
     my $ostab    = xCAT::Table->new('nodetype');
     my $sitetab  = xCAT::Table->new('site');
-    my $installroot;
-    $installroot = "/install";
+
+    my $installroot = xCAT::Utils->getInstallDir();
+    my $tftpdir = xCAT::Utils->getTftpDir();
+
     my $xcatiport;
 
     if ($sitetab)
     {
-        (my $ref) = $sitetab->getAttribs({key => installdir}, value);
-        if ($ref and $ref->{value})
-        {
-            $installroot = $ref->{value};
-        }
-        ($ref) = $sitetab->getAttribs({key => xcatiport}, value);
+        (my $ref) = $sitetab->getAttribs({key => xcatiport}, value);
         if ($ref and $ref->{value})
         {
             $xcatiport = $ref->{value};