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

-Bug#2757520 is fixed; use the mac value in mac table to generate netdevice for sles full installation

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3179 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
mxi1 2009-04-13 14:58:18 +00:00
parent 58b5084841
commit 4900e9d6e8
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -395,18 +395,31 @@ 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 ($ent->{installnic})
#{
# $kcmdline .= " netdevice=" . $ent->{installnic};
#}
#elsif ($ent->{primarynic})
#{
# $kcmdline .= " netdevice=" . $ent->{primarynic};
#}
#else
#{
# $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";
}
#TODO: driver disk handling should in SLES case be a mod of the install source, nothing to see here
if (defined $sent->{serialport})