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

-Revert recent changes that break under some environments, will have to discuss and make a more robust solution for everyone. For release, probably going to have workarounds for now

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3195 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso
2009-04-14 19:11:41 +00:00
parent be121bafb2
commit 414b6193c3
1 changed files with 12 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -395,45 +395,18 @@ sub mkinstall
. " install=http://"
. $ent->{nfsserver}
. "/install/$os/$arch/1";
#if ($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";
}
}
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
if (defined $sent->{serialport})