xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-30 19:02:27 +00:00
Code Issues Releases Wiki Activity

-Fix anaconda plugin for rhel6 and also fix auto-detect function

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@7564 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso
2010-09-21 20:42:12 +00:00
parent 22ba7a0f7c
commit 9bdc49c33e
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
xCAT-server/lib/xcat/plugins/anaconda.pm
View File

@@ -512,34 +512,36 @@ sub mknetboot
# add one parameter: ifname=<eth0>:<mac address>
# which is used for dracut
# the redhat5.x os will ignore it
$kcmdline .= "ifname=";
my $useifname=0;
if ($reshash->{$node}->[0] and $reshash->{$node}->[0]->{installnic}) {
if ($reshash->{$node}->[0]->{installnic} ne "mac") {
$kcmdline .= $reshash->{$node}->[0]->{installnic} . ":";
$useifname=1;
$kcmdline .= "ifname=".$reshash->{$node}->[0]->{installnic} . ":";
}
} elsif ($nodebootif) {
$kcmdline .= "$nodebootif:";
$useifname=1;
$kcmdline .= "ifname=$nodebootif:";
} elsif ($reshash->{$node}->[0] and $reshash->{$node}->[0]->{primarynic}) {
$kcmdline .= "$primarynic:";
}
else {
$kcmdline .="eth0:";
print "eth0 is used as the default booting network devices...\n";
$useifname=1;
$kcmdline .= "ifname=".$reshash->{$node}->[0]->{primarynic}.":";
}
#else { #no, we autodetect and don't presume anything
# $kcmdline .="eth0:";
# print "eth0 is used as the default booting network devices...\n";
#}
# append the mac address
my $mac;
if($machash->{$node}->[0] && $machash->{$node}->[0]->{'mac'}) {
if($useifname && $machash->{$node}->[0] && $machash->{$node}->[0]->{'mac'}) {
# TODO: currently, only "mac" attribute with classic style is used, the "|" delimited string of "macaddress!hostname" format is not used
$mac = $machash->{$node}->[0]->{'mac'};
if ( (index($mac, "|") eq -1) and (index($mac, "!") eq -1) ) {
$kcmdline .= "$mac";
$kcmdline .= "$mac ";
} else {
print qq{In the "mac" table, the "|" delimited string of "macaddress!hostname" format is not supported by "nodeset <nr> netboot|statelite".};
die qq{In the "mac" table, the "|" delimited string of "macaddress!hostname" format is not supported by "nodeset <nr> netboot|statelite if installnic/primarynic is set".};
}
} else { # it should never happen
$callback->({error=>["cannot find the mac address for $node in mac table"], errorcode=>[1]});
#} else { # it should never happen, but we don't always do it this way
# $callback->({error=>["cannot find the mac address for $node in mac table"], errorcode=>[1]});
}
$kcmdline .= " ";
# add "netdev=<eth0>" or "BOOTIF=<mac>"
my $netdev = "";