arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

This needs to be rethought, it breaks x netboot

Browse Source 
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
This commit is contained in:
jbjohnso 2012-09-05 21:09:18 +00:00
parent aff28da21d
commit ae54f6a4c5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xCAT-server/lib/xcat/plugins/anaconda.pm
View File

@ -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 . " ";
}
}