From 631a625666700c371fe77886906cc3ff06d7eeaf Mon Sep 17 00:00:00 2001
From: wanghuaz <wanghuaz@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 3 May 2011 06:14:03 +0000
Subject: [PATCH] Fixed a getmacs issue 3294236 in 2.6.6

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9470 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/FSPmac.pm |  7 ++++---
 perl-xCAT/xCAT/PPCmac.pm | 15 ++++++++-------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/perl-xCAT/xCAT/FSPmac.pm b/perl-xCAT/xCAT/FSPmac.pm
index 38822ca56..8a8558334 100644
--- a/perl-xCAT/xCAT/FSPmac.pm
+++ b/perl-xCAT/xCAT/FSPmac.pm
@@ -580,10 +580,11 @@ sub format_mac {
     # Get adapter mac
     #####################################
     my @newmacs;
+    my $newmac = $mac;
     my @macs = split /\|/, $mac;
 
-    foreach my $mac_a ( @macs ) {
-        if ( !xCAT::Utils->isAIX() ) {
+    if ( !xCAT::Utils->isAIX() ) {
+        foreach my $mac_a ( @macs ) {
             #################################
             # Delineate MAC with colons
             #################################
@@ -592,9 +593,9 @@ sub format_mac {
             $mac_a =~ s/:$//;
             push @newmacs, $mac_a;
         }
+        $newmac = join("|",@newmacs);
     }
 
-    my $newmac = join("|",@newmacs);
 
     return( "$newmac" );
 
diff --git a/perl-xCAT/xCAT/PPCmac.pm b/perl-xCAT/xCAT/PPCmac.pm
index 9f103bb32..f554d0732 100644
--- a/perl-xCAT/xCAT/PPCmac.pm
+++ b/perl-xCAT/xCAT/PPCmac.pm
@@ -741,17 +741,18 @@ sub cal_mac {
 ##########################################################################
 sub format_mac {
 
-    my $mac = shift;
-    #my $data = shift;
+    my $data = shift;
 
+    $data =~ /^(\S+\s+\S+\s+)(\S+)(\s+.*)$/;
+    my $mac = $2;
     #####################################
     # Get adapter mac
     #####################################
     my @newmacs;
     my @macs = split /\|/, $mac;
 
-    foreach my $mac_a ( @macs ) {
-        if ( !xCAT::Utils->isAIX() ) {
+    if ( !xCAT::Utils->isAIX() ) {
+        foreach my $mac_a ( @macs ) {
             #################################
             # Delineate MAC with colons
             #################################
@@ -760,11 +761,11 @@ sub format_mac {
             $mac_a =~ s/:$//;
             push @newmacs, $mac_a;
         }
+        my $newmac = join("|",@newmacs);
+        $data   =~ s/$mac/$newmac/;
     }
 
-    my $newmac = join("|",@newmacs);
-
-    return( "$newmac" );
+    return( "$data\n" );
 
 }