From 7e34083819865143a58a6ea2e5370984113dc38a Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 19 Jul 2012 19:44:52 +0000
Subject: [PATCH] Revert "fix bug 3529429 for kdump failed on non-p7 ih plinux"

This reverts commit 9cc15677f3f5ac8d39b5dbade048c83aa8926e47.

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

diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm
index 55e862f3c..f3477ed46 100644
--- a/xCAT-server/lib/xcat/plugins/anaconda.pm
+++ b/xCAT-server/lib/xcat/plugins/anaconda.pm
@@ -614,7 +614,7 @@ sub mknetboot
         #}
         # append the mac address
         my $mac;
-        if( $machash->{$node}->[0] && $machash->{$node}->[0]->{'mac'}) {
+        if( $useifname && $machash->{$node}->[0] && $machash->{$node}->[0]->{'mac'}) {
             # TODO: currently, only "mac" attribute with classic style is used, the "|" delimited string of "macaddress!hostname" format is not used
             $mac = $machash->{$node}->[0]->{'mac'};
 #            if ( (index($mac, "|") eq -1) and (index($mac, "!") eq -1) ) {
@@ -642,7 +642,7 @@ sub mknetboot
         } elsif ( $reshash->{$node}->[0] and $reshash->{$node}->[0]->{primarynic} and $reshash->{$node}->[0]->{primarynic} ne "mac") {
             $kcmdline .= "netdev=" . $reshash->{$node}->[0]->{primarynic} . " ";
         } else {
-            if ( !$useifname && $mac) {
+            if ( $useifname && $mac) {
                 $kcmdline .= "BOOTIF=" . $mac . " ";
             }
         }