From ca9993246f8b860d47e4e37d860582a1e67de044 Mon Sep 17 00:00:00 2001
From: daniceexi <daniceexi@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 24 Feb 2010 08:13:33 +0000
Subject: [PATCH]  defect 2948328: use getInstallDir to get the install dir

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

diff --git a/xCAT-server/lib/xcat/plugins/AAsn.pm b/xCAT-server/lib/xcat/plugins/AAsn.pm
index 0ecbe95c9..f6b316792 100644
--- a/xCAT-server/lib/xcat/plugins/AAsn.pm
+++ b/xCAT-server/lib/xcat/plugins/AAsn.pm
@@ -284,8 +284,8 @@ sub mountInstall
 {
     my ($nodename) = @_;
     my $rc         = 0;
-    my $installdir = "/install";    # default
-    my $installloc = "/install";    # default
+    my $installdir = xCAT::Utils->getInstallDir();
+    my $installloc = xCAT::Utils->getInstallDir();
     my $newinstallloc;
     # read DB for nodeinfo
     my $master;
@@ -328,11 +328,6 @@ sub mountInstall
 
         if ($nomount == 0)
         {    # mount the install directory
-            my @installdir1 = xCAT::Utils->get_site_attribute("installdir");
-            if ($installdir1[0])
-            {
-                $installdir = $installdir1[0];    # save directory to mount to
-            }
             if (!(-e $installdir))
             {
                 mkpath($installdir);
@@ -513,13 +508,7 @@ sub setup_FTP
     # change ftp user id home directory to installdir
     # link installdir
     # restart the daemon
-    my $installdir = "/install";    # default
-                                    # read from database
-    my @installdir1 = xCAT::Utils->get_site_attribute("installdir");
-    if ($installdir1[0])            # if exists
-    {
-        $installdir = $installdir1[0];
-    }
+    my $installdir = xCAT::Utils->getInstallDir();
     if (!(-e $installdir))          # make it
     {
         mkpath($installdir);