From 414b6193c3cd5f4a9dc2ddc8e37c1403dea7ded2 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 14 Apr 2009 19:11:41 +0000
Subject: [PATCH] -Revert recent changes that break under some environments,
 will have to discuss and make a more robust solution for everyone.  For
 release, probably going to have workarounds for now

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

diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm
index 8cc23598a..79cea3c3c 100644
--- a/xCAT-server/lib/xcat/plugins/sles.pm
+++ b/xCAT-server/lib/xcat/plugins/sles.pm
@@ -395,45 +395,18 @@ 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 ($arch eq "ppc64") {
-                  #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}";
-                  } else {
-                      $callback->(
-                          {
-                              error => [
-                                "Unable to find the mac address for $node!"
-                              ],
-                              errorcode => [1]
-                          }
-                      );
-
-                  }
-              } else {  #mac.mac is not verified on system x, so it keeps the old way
-                  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";
+            }
 
             #TODO: driver disk handling should in SLES case be a mod of the install source, nothing to see here
             if (defined $sent->{serialport})