From 4505e8a91e8555e549f451a9b60569e3915c5c52 Mon Sep 17 00:00:00 2001
From: immarvin <immarvin@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 28 Jun 2012 07:21:51 +0000
Subject: [PATCH] fix  defect ID: 3537687 BOOTIF is not written into yaboot
 file on sles11.2 for ppc64

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@13187 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/sles.pm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm
index c8b17d9b8..527b86b29 100644
--- a/xCAT-server/lib/xcat/plugins/sles.pm
+++ b/xCAT-server/lib/xcat/plugins/sles.pm
@@ -473,14 +473,12 @@ sub mknetboot
         my $netdev = "";
         my $mac = $machash->{$node}->[0]->{mac};
 
-        if ($reshash->{$node}->[0] and $reshash->{$node}->[0]->{installnic}) {
-            if ($reshash->{$node}->[0]->{installnic} ne "mac") {
+        if ($reshash->{$node}->[0] and $reshash->{$node}->[0]->{installnic} and ($reshash->{$node}->[0]->{installnic} ne "mac")) {
                 $kcmdline .= "netdev=" . $reshash->{$node}->[0]->{installnic} . " ";
-            }
         } elsif ($nodebootif) {
             $kcmdline .=  "netdev=" . $nodebootif . " ";
-        } elsif ($reshash->{$node}->[0] and $reshash->{$node}->[0]->{primarynic}) {
-            $kcmdline .= "netdev=" . $reshash->{$node}->[0]->{primarynic} . " ";
+        } elsif ($reshash->{$node}->[0] and $reshash->{$node}->[0]->{primarynic} and ($reshash->{$node}->[0]->{primarynic} ne "mac")) {   
+	    $kcmdline .= "netdev=" . $reshash->{$node}->[0]->{primarynic} . " ";
         } else {
             if ($arch =~ /x86/) {
                 #do nothing, we'll let pxe/xnba work their magic