From ae54f6a4c539597926c8a3fa4be5f42a93c5edbf Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Wed, 5 Sep 2012 21:09:18 +0000 Subject: [PATCH] This needs to be rethought, it breaks x netboot Revert "fix bug 3529429 for kdump failed on non-p7 ih plinux" This reverts commit 9eb7de3d634ca1f7fe857df50976ca6614281e83. git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13720 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 b95971c95..4600b0b3e 100644 --- a/xCAT-server/lib/xcat/plugins/anaconda.pm +++ b/xCAT-server/lib/xcat/plugins/anaconda.pm @@ -640,7 +640,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) ) { @@ -668,7 +668,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 . " "; } }