From 1c3496a1db3e54ab09fcb459a871d3e285697a40 Mon Sep 17 00:00:00 2001
From: daniceexi <wxp@cn.ibm.com>
Date: Wed, 24 Dec 2014 06:22:04 -0500
Subject: [PATCH] defect 4492: to support comstomized script for install nic

---
 xCAT/postscripts/confignics | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/xCAT/postscripts/confignics b/xCAT/postscripts/confignics
index e4234c885..174de932f 100755
--- a/xCAT/postscripts/confignics
+++ b/xCAT/postscripts/confignics
@@ -206,10 +206,6 @@ elif [ `echo $str_temp | grep -E "e(n|th)[0-9a-z]+"` ];then
     str_inst_nic=$str_temp
 fi
 
-if [ $bool_cfg_inst_nic -eq 1 ];then
-    configeth -s $str_inst_nic 
-fi
-
 bool_exit_flag=0
 #check the required attributes
 if [ -z "$NICIPS" ];then
@@ -287,9 +283,6 @@ do
     key=`echo $key | sed 's/^ \+//' | sed 's/ \+$//'`
     str_nic_type=
     str_value=$(hashget hash_defined_nics $key)
-    if [ "$key" = "$str_inst_nic" ];then
-        continue
-    fi
     old_ifs=$IFS
     IFS=$','
     array_temp=($str_value)
@@ -300,6 +293,16 @@ do
         echo "confignics on $NODE: processing custom scripts: ${array_temp[1]} for interface $key"
         ${array_temp[1]}
     else
+        if [ "$key" = "$str_inst_nic" ];then
+            if [ $bool_cfg_inst_nic -eq 1 ];then
+                logger -t xcat -p local4.info "confignics: call 'configeth $str_inst_nic'"
+                echo "confignics on $NODE: call 'configeth -s $str_inst_nic"
+                configeth -s $str_inst_nic
+                continue
+            else
+                continue
+            fi
+        fi
         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