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

defect 2948328: use getInstallDir to get the install dir

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5273 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
daniceexi
2010-02-24 08:13:33 +00:00
parent 3231d29244
commit ca9993246f
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
xCAT-server/lib/xcat/plugins/AAsn.pm
View File

@@ -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);