xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-30 19:02:27 +00:00
Code Issues Releases Wiki Activity

confignics find wrong network for nic when mask is empty (#5809)

Browse Source 
* confignics find wrong network for nic when mask is empty
This commit is contained in:
Yuan Bai
2018-11-16 13:21:06 +08:00
committed by Bin Xu
parent ed6852a9e4
commit c64a539b5a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
xCAT/postscripts/confignics
View File

@@ -81,6 +81,10 @@ function findnetwork(){
eval str_temp=\$NETWORKS_LINE$num_i
str_net=`echo $str_temp | awk -F'net=' '{print $2}' | awk -F'|' '{print $1}'`
str_mask=`echo $str_temp | awk -F'mask=' '{print $2}' | awk -F'|' '{print $1}' | sed 's:^/::'`
if [ ! $str_mask ]; then
num_i=$((num_i+1))
continue
fi
echo $str_net | grep ':' > /dev/null
if [ $? -ne 0 ];then
if [ $flag_v6 -eq 0 ];then
@@ -107,8 +111,7 @@ function findnetwork(){
fi
num_i=$((num_i+1))
done
echo "Error: Can not find the corresponding network defination for ip address: $str_ip ."
echo "Error: Can not find a valid network defination for ip address: $str_ip , make sure netname,net and mask are correct in networks table."
error_code=1
}
@@ -339,7 +342,6 @@ do
error_code=1
continue
fi
str_network=$(checknetwork ${array_temp[0]})
echo "$str_network" | grep -i 'error' > /dev/null
if [ $? -eq 0 ];then
@@ -347,7 +349,6 @@ do
echo "confignics on $NODE: $str_network"
continue
fi
if [ "$str_nic_type" = "ethernet" ];then
logger -t $log_label -p local4.info "confignics: call 'configeth $key ${array_temp[0]} $str_network'"
echo "confignics on $NODE: call 'configeth $key ${array_temp[0]} $str_network'"