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

-bug#2757520: only use mac.mac for system p; but left system x to use the old way

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3189 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
mxi1
2009-04-14 13:51:33 +00:00
parent f6bb7a5e8e
commit eb96724594
1 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -408,17 +408,31 @@ sub mkinstall
# $kcmdline .= " netdevice=eth0";
#}
#use mac.mac to set "netdevice=", if mac.mac exists
my $mactab = xCAT::Table->new('mac');
(my $macref) = $mactab->getAttribs({node => $node}, mac);
if ($macref) {
$kcmdline .= " netdevice=$macref->{mac}";
}elsif ($ent->{installnic}) {
$kcmdline .= " netdevice=" . $ent->{installnic};
}elsif ($ent->{primarynic}) {
$kcmdline .= " netdevice=" . $ent->{primarynic};
}else {
$kcmdline .= " netdevice=eth0";
if ($arch eq "ppc64") {
#use mac.mac to set "netdevice=", if mac.mac exists
my $mactab = xCAT::Table->new('mac');
(my $macref) = $mactab->getAttribs({node => $node}, mac);
if ($macref) {
$kcmdline .= " netdevice=$macref->{mac}";
} else {
$callback->(
{
error => [
"Unable to find the mac address for $node!"
],
errorcode => [1]
}
);
}
} else { #mac.mac is not verified on system x, so it keeps the old way
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