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

for defect 3089649, 3089643 and 3089635

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7882 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
mxi1 2010-10-18 10:13:44 +00:00
parent 4485ffec13
commit 793f736a83
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -241,7 +241,6 @@ sub mknetboot
my $platform;
my $rootimgdir;
my $nodebootif; # nodebootif will be used if noderes.installnic is not set
my $installnic; # the noderes.installnic value
my $ent = $oents{$node}->[0]; #ostab->getNodeAttribs($node, ['os', 'arch', 'profile']);
if ($ent and $ent->{provmethod} and ($ent->{provmethod} ne 'install') and ($ent->{provmethod} ne 'netboot') and ($ent->{provmethod} ne 'statelite')) {

4
xCAT-server/lib/xcat/plugins/sles.pm
View File

@ -90,7 +90,7 @@ sub mknetboot
my $machash = $mactab->getNodesAttribs(\@nodes, ['interface', 'mac']);
my $restab = xCAT::Table->new('noderes');
my $reshash = $restab->getNodesAttribs(\@nodes, ['primarynic', 'tftpserver', 'xcatmaster', 'nfsserver', 'nfsdir', 'installdir']);
my $reshash = $restab->getNodesAttribs(\@nodes, ['primarynic', 'tftpserver', 'xcatmaster', 'nfsserver', 'nfsdir', 'installnic']);
my %donetftp=();
foreach my $node (@nodes)
@ -100,7 +100,6 @@ sub mknetboot
my $profile;
my $rootimgdir;
my $nodebootif; # nodebootif will be used if noderes.installnic is not set
my $installnic; # the noderes.installnic value
my $ent= $ntents->{$node}->[0];
if ($ent and $ent->{provmethod} and ($ent->{provmethod} ne 'install') and ($ent->{provmethod} ne 'netboot') and ($ent->{provmethod} ne 'statelite')) {
@ -137,6 +136,7 @@ sub mknetboot
$osver = $ph->{osver};
$arch = $ph->{osarch};
$profile = $ph->{profile};
$nodebootif = $ph->{nodebootif};
$rootimgdir = $ph->{rootimgdir};
unless ($rootimgdir) {