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

Bug #4580, Parse Mac Address before generate network boot params

Browse Source
This commit is contained in:
Casandra Qiu 2015-02-27 09:04:18 -05:00
parent 73ed881e05
commit 78cdcc04b3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xCAT-server/lib/xcat/plugins/debian.pm
View File

@ -837,7 +837,11 @@ sub mkinstall
if ($maxmem) {
$kcmdline.=" mem=$maxmem";
}
my $net_params = xCAT::NetworkUtils->gen_net_boot_params($ent->{installnic},$ent->{primarynic},$macent->{mac});
# parse Mac table to get one mac address in case there are multiples.
$mac = xCAT::Utils->parseMacTabEntry($macent->{mac},$node);
my $net_params = xCAT::NetworkUtils->gen_net_boot_params($ent->{installnic},$ent->{primarynic},$mac);
if (exists($net_params->{nicname})) {
$kcmdline .= " netcfg/choose_interface=". $net_params->{nicname};
} elsif (exists($net_params->{mac})) {