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

This commit is contained in:
daniceexi 2014-08-07 02:36:59 -04:00
parent 3f75ebb967
commit 89679fe77b

View File

@ -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"