From 4900e9d6e81d15bc567332c79ce2998ebb052da4 Mon Sep 17 00:00:00 2001
From: mxi1 <mxi1@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 13 Apr 2009 14:58:18 +0000
Subject: [PATCH] -Bug#2757520 is fixed; use the mac value in mac table to
 generate netdevice for sles full installation

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

diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm
index 79cea3c3c..71ff799ba 100644
--- a/xCAT-server/lib/xcat/plugins/sles.pm
+++ b/xCAT-server/lib/xcat/plugins/sles.pm
@@ -395,18 +395,31 @@ sub mkinstall
               . " install=http://"
               . $ent->{nfsserver}
               . "/install/$os/$arch/1";
-            if ($ent->{installnic})
-            {
-                $kcmdline .= " netdevice=" . $ent->{installnic};
-            }
-            elsif ($ent->{primarynic})
-            {
-                $kcmdline .= " netdevice=" . $ent->{primarynic};
-            }
-            else
-            {
-                $kcmdline .= " netdevice=eth0";
-            }
+              #if ($ent->{installnic})
+              #{
+              #  $kcmdline .= " netdevice=" . $ent->{installnic};
+              #}
+              #elsif ($ent->{primarynic})
+              #{
+              #  $kcmdline .= " netdevice=" . $ent->{primarynic};
+              #}
+              #else
+              #{
+              #  $kcmdline .= " netdevice=eth0";
+              #}
+
+              #use mac.mac to set "netdevice=", if mac.mac exists
+              my $mactab = xCAT::Table->new('mac');
+              (my $macref) = $mactab->getAttribs({node => $node}, mac);
+              if ($macref) {
+                  $kcmdline .= " netdevice=$macref->{mac}";
+              }elsif ($ent->{installnic}) {
+                  $kcmdline .= " netdevice=" . $ent->{installnic};
+              }elsif ($ent->{primarynic}) {
+                  $kcmdline .= " netdevice=" . $ent->{primarynic};
+              }else {
+                  $kcmdline .= " netdevice=eth0";
+              }
 
             #TODO: driver disk handling should in SLES case be a mod of the install source, nothing to see here
             if (defined $sent->{serialport})