From 793f736a83cc48723b7bee08b20c625fe2effe84 Mon Sep 17 00:00:00 2001
From: mxi1 <mxi1@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 18 Oct 2010 10:13:44 +0000
Subject: [PATCH] for defect 3089649, 3089643 and 3089635

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

diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm
index 57a03f980..9d2fc1d6a 100644
--- a/xCAT-server/lib/xcat/plugins/anaconda.pm
+++ b/xCAT-server/lib/xcat/plugins/anaconda.pm
@@ -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')) {
diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm
index e3ea969a9..5e0007649 100644
--- a/xCAT-server/lib/xcat/plugins/sles.pm
+++ b/xCAT-server/lib/xcat/plugins/sles.pm
@@ -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) {