From 5f65a3f1d240bd347a4473dd3b52f0331637e765 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Thu, 1 Nov 2012 19:21:13 +0000 Subject: [PATCH] Carefully trim off extra mac address cruft to mitigate some failures git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14205 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/anaconda.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm index d267e3793..1790bda27 100644 --- a/xCAT-server/lib/xcat/plugins/anaconda.pm +++ b/xCAT-server/lib/xcat/plugins/anaconda.pm @@ -648,6 +648,8 @@ sub mknetboot if ($mac !~ /:/) { $mac =~s/(..)(..)(..)(..)(..)(..)/$1:$2:$3:$4:$5:$6/; } + $mac =~ s/!.*//; #remove multi-interface mac information + $mac =~ s/\|.*//; # } else { # $callback->({ error=>[ qq{In the "mac" table, the "|" delimited string of "macaddress!hostname" format is not supported by "nodeset netboot|statelite if installnic/primarynic is set".}], errorcode=>[1]}); # return;