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

defect 2947831: use subroutine getInstallDir to get install dir

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5275 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
daniceexi 2010-02-24 08:26:34 +00:00
parent 622c6967b2
commit 2dd7b08aeb
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xCAT-server/lib/perl/xCAT/SvrUtils.pm
View File

@ -218,6 +218,8 @@ sub getsynclistfile()
my ($os, $arch, $profile, $inst_type) = @_;
my $installdir = xCAT::Utils->getInstallDir();
# for aix node, use the node figure out the profile, then use the value of
# profile (osimage name) to get the synclist file path (osimage.synclists)
if (xCAT::Utils->isAIX()) {
@ -319,7 +321,7 @@ sub getsynclistfile()
elsif ($os =~ /AIX.*/) { $platform = "AIX"; }
}
my $base = "/install/custom/$inst_type/$platform";
my $base = "$installdir/custom/$inst_type/$platform";
if (-r "$base/$profile.$os.$arch.synclist") {
$node_syncfile{$node} = "$base/$profile.$os.$arch.synclist";
} elsif (-r "$base/$profile.$arch.synclist") {
@ -344,7 +346,7 @@ sub getsynclistfile()
elsif ($os =~ /win/) {$platform = "windows"; }
}
my $base = "/install/custom/$inst_type/$platform";
my $base = "$installdir/custom/$inst_type/$platform";
if (-r "$base/$profile.$os.$arch.synclist") {
return "$base/$profile.$os.$arch.synclist";
} elsif (-r "$base/$profile.$arch.synclist") {
@ -516,7 +518,7 @@ sub update_tables_with_templates
#print "osver=$osver, arch=$arch, osname=$osname, genos=$genos\n";
my $installroot="/install";
my $installroot = xCAT::Utils->getInstallDir();
my $sitetab = xCAT::Table->new('site');
if ($sitetab) {
(my $ref) = $sitetab->getAttribs({key => "installdir"}, "value");
@ -673,7 +675,7 @@ sub update_tables_with_diskless_image
}
#print "osver=$osver, arch=$arch, osname=$osname, genos=$genos, profile=$profile\n";
my $installroot="/install";
my $installroot = xCAT::Utils->getInstallDir();
my $sitetab = xCAT::Table->new('site');
if ($sitetab) {
(my $ref) = $sitetab->getAttribs({key => "installdir"}, "value");