From fd1a6dba3128f4f5e9617a4aa214184f120b317c Mon Sep 17 00:00:00 2001
From: daniceexi <wxp@cn.ibm.com>
Date: Thu, 7 Aug 2014 02:36:59 -0400
Subject: [PATCH] defect 4232: fix1 - support interface named like em5 which is
 the general format of Ubuntu; fix2 - fix the issue that confignics cannot
 handle the networks attribute has multiple nets for one nic

---
 xCAT/postscripts/confignics | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xCAT/postscripts/confignics b/xCAT/postscripts/confignics
index 4054ff9cb..e4234c885 100755
--- a/xCAT/postscripts/confignics
+++ b/xCAT/postscripts/confignics
@@ -122,7 +122,7 @@ function checknetwork(){
             echo "$str_networkname"
             return
         fi
-        str_ret="${str_ret}${str_networkname},"
+        str_ret="${str_ret}${str_networkname}|"
 
         num_index=$((num_index+1))
     done
@@ -300,7 +300,7 @@ do
         echo "confignics on $NODE: processing custom scripts: ${array_temp[1]} for interface $key"
         ${array_temp[1]}
     else
-        if [ `echo $key | grep -E 'e(n|th)[0-9a-z]+'` ];then
+        if [ `echo $key | grep -E 'e(n|th|m)[0-9a-z]+'` ];then
             str_nic_type="ethernet"
         elif [ `echo $key | grep -E 'ib[0-9]+'` ];then
             str_nic_type="infiniband"