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

-bug 2757520 is fixed for system P: mac-adress is used as netdevice parameter for system p machines by minjun

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3577 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
mxi1
2009-06-15 10:34:19 +00:00
parent 7bb0ee5659
commit f1017f7be6
1 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -357,7 +357,7 @@ sub mkinstall
#special case for sles 11
if ( $os eq 'sles11' and -r "/install/$os/$arch/1/suseboot/yaboot")
{
copy("/install/$os/$arch/1/suseboot/yaboot", "/tftpboot/");
copy("/install/$os/$arch/1/suseboot/yaboot", "/tftpboot/");
}
}
$doneimgs{"$os|$arch"} = 1;
@@ -395,17 +395,43 @@ sub mkinstall
. " install=http://"
. $ent->{nfsserver}
. "/install/$os/$arch/1";
if ($ent->{installnic})
my $mgtref = $hmtab->getNodeAttribs($node, ['mgt']);
#special case for system P machines, which is mgted by hmc or ivm
#mac address is used to identify the netdevice
if( ($mgtref->{mgt} eq "hmc" || $mgtref->{mgt} eq "ivm") && $arch =~ /ppc/)
{
$kcmdline .= " netdevice=" . $ent->{installnic};
}
elsif ($ent->{primarynic})
my $mactab = xCAT::Table->new("mac");
my $macref = $mactab->getNodeAttribs($node, ['mac']);
if (defined $macref->{mac})
{
$kcmdline .= " netdevice=" . $macref->{mac};
}
else
{
$callback->(
{
error => ["No mac.mac for $node defined"],
errorcode => [1]
}
);
}
}
else
{
$kcmdline .= " netdevice=" . $ent->{primarynic};
}
else
{
$kcmdline .= " netdevice=eth0";
if ($ent->{installnic})
{
$kcmdline .= " netdevice=" . $ent->{installnic};
}
elsif ($ent->{primarynic})
{
$kcmdline .= " netdevice=" . $ent->{primarynic};
}
else
{
$kcmdline .= " netdevice=eth0";
}
}
#TODO: driver disk handling should in SLES case be a mod of the install source, nothing to see here