From dea6d6d0b8326fb0c71d708894d9c8d8ddd3d9aa Mon Sep 17 00:00:00 2001
From: bybai <bybai@cn.ibm.com>
Date: Tue, 23 Feb 2016 02:37:15 -0500
Subject: [PATCH] polish fix 630

---
 xCAT/postscripts/confignetwork | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/xCAT/postscripts/confignetwork b/xCAT/postscripts/confignetwork
index a54814cfc..9dec758b0 100755
--- a/xCAT/postscripts/confignetwork
+++ b/xCAT/postscripts/confignetwork
@@ -254,12 +254,9 @@ function sort_nics_device_order {
                 temp_base_nic_type=`find_nic_type "$i"`
                 if [ x"$temp_base_nic_type_one" = x ]; then
                     temp_base_nic_type_one=$temp_base_nic_type
-                else
-                    #all base nic devices types should be the same
-                    if [ x"$temp_base_nic_type" != x"$temp_base_nic_type_one" ]; then
-                        break
-                    fi
-                    temp_base_nic_type_one=$temp_base_nic_type
+                elif [ x"$temp_base_nic_type" != x"$temp_base_nic_type_one" ]; then
+                    log_error "different nic device types in $base_nic_dev."
+                    break 2
                 fi
             done
         else