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

fix for bug 3043019: remove the hardcoded tftpboot in ananconda.pm

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7107 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
ligc 2010-08-17 08:56:31 +00:00
parent 75cdca63e6
commit 147284c129
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xCAT-server/lib/xcat/plugins/anaconda.pm
View File

@ -205,6 +205,11 @@ sub mknetboot
{
$xcatdport = $ref->{value};
}
($ref) = $sitetab->getAttribs({key => 'tftpdir'}, 'value');
if ($ref and $ref->{value})
{
$tftpdir = $ref->{value};
}
}
my %donetftp=();
my %oents = %{$ostab->getNodesAttribs(\@nodes,[qw(os arch profile provmethod)])};
@ -566,7 +571,9 @@ sub mkinstall
my %img_hash=();
my $installroot;
my $tftpdir;
$installroot = "/install";
$tftpdir = "/tftpboot";
if ($sitetab)
{
@ -575,6 +582,11 @@ sub mkinstall
{
$installroot = $ref->{value};
}
($ref) = $sitetab->getAttribs({key => 'tftpdir'}, 'value');
if ($ref and $ref->{value})
{
$tftpdir = $ref->{value};
}
}
my $node;
@ -775,7 +787,7 @@ sub mkinstall
next;
}
#my $installdir="/install"; #TODO: not hardcode installdir
my $tftpdir = "/tftpboot";
#my $tftpdir = "/tftpboot";
# create the node-specific post scripts
#mkpath "/install/postscripts/";
@ -825,7 +837,7 @@ sub mkinstall
#TODO: driver slipstream, targetted for network.
unless ($doneimgs{"$os|$arch"})
{
mkpath("/tftpboot/xcat/$os/$arch");
mkpath("$tftpdir/xcat/$os/$arch");
if($esxi){
copyesxiboot($pkgdir, "$tftpdir/xcat/$os/$arch");
}else{