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

fix defect ID: 3537687 BOOTIF is not written into yaboot file on sles11.2 for ppc64

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@13187 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
immarvin 2012-06-28 07:21:51 +00:00
parent 0a3b830c83
commit 4505e8a91e
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT-server/lib/xcat/plugins/sles.pm
View File

@ -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