From 78cdcc04b367ccfc6c13ab5e9f51fd662e1de778 Mon Sep 17 00:00:00 2001 From: Casandra Qiu Date: Fri, 27 Feb 2015 09:04:18 -0500 Subject: [PATCH] Bug #4580, Parse Mac Address before generate network boot params --- xCAT-server/lib/xcat/plugins/debian.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xCAT-server/lib/xcat/plugins/debian.pm b/xCAT-server/lib/xcat/plugins/debian.pm index 630f7f012..c0bfa3fcd 100755 --- a/xCAT-server/lib/xcat/plugins/debian.pm +++ b/xCAT-server/lib/xcat/plugins/debian.pm @@ -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})) {