diff --git a/xCAT/postscripts/confignetwork b/xCAT/postscripts/confignetwork index 8c9dcca90..9dec758b0 100755 --- a/xCAT/postscripts/confignetwork +++ b/xCAT/postscripts/confignetwork @@ -249,11 +249,22 @@ function sort_nics_device_order { #find nicdevice type as base_nic_type base_nic_dev=`echo "$nics_list" |sed -n "${num}p"|awk '{print $2}'` if echo "$base_nic_dev"|grep "@" >/dev/null; then - temp_base_nic_dev=`echo $base_nic_dev|awk -F@ '{print $1}'` + for i in `echo "$base_nic_dev" |sed 's/@/ /g'` + do + 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 + 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 temp_base_nic_dev=$base_nic_dev + temp_base_nic_type=`find_nic_type "temp_base_nic_dev"` fi - base_nic_type=`find_nic_type "$temp_base_nic_dev"` + + base_nic_type=$temp_base_nic_type nic_dev=`echo "$nics_list" |sed -n "${num}p"|awk '{print $1}'` nic_dev_type=`find_nic_type "$nic_dev"`