xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-07-24 13:21:12 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3710 from bybai/log

Browse Source 
confignetwork error message enhancement
This commit is contained in:
zet809
2017-08-30 16:32:56 +08:00
committed by GitHub
parent 3935971a22 beeb80cfde
commit 80bbe5eece
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xCAT/postscripts/confignetwork
View File

@@ -406,12 +406,12 @@ function sort_nics_device_order {
vlan_slot=$vlan_slot" "$num
fi
else
echo "Error: $nic_dev $base_nic_dev pair is invalid nic and nicdevice pair."
echo "Error: nicdevices.$nic_dev base nic device cannot be $base_nic_type $base_nic_dev.(nicdevices is only required on Bond/VLAN/Bridge)"
fi
((num+=1))
done
else
log_error "Error: only support configure bond/vlan/bridge on redhat."
log_error "Only support configuration of Bond/VLAN/Bridge on Red Hat."
fi
fi
new_order=$eth_slot" "$bond_slot" "$vlan_slot
@@ -555,7 +555,7 @@ function configure_nicdevice {
errorcode=1
fi
else
log_error "Error : please check nic data in nics table."
log_error "Check the NIC data in the 'nics' table."
errorcode=1
fi
@@ -647,7 +647,7 @@ sorted_nicdevice_list=`sort_nics_device_order "$new_nicdevice"`
#If there is invalid nics pair, errorcode is 1
invalid_nicdevice_pair=`echo "$sorted_nicdevice_list" | grep "Error"`
if [ $? -eq 0 ]; then
echo "$invalid_nicdevice_pair"|log_lines error
echo "$invalid_nicdevice_pair"|sed 's/Error://g'|log_lines error
errorcode=1
fi

4
xCAT/postscripts/nicutils.sh
View File

@@ -76,7 +76,7 @@ function log_lines {
######################################################
function log_error {
local __msg="$*"
$log_print_cmd $log_print_arg "[E]: $__msg"
$log_print_cmd $log_print_arg "[E]:Error: $__msg"
return 0
}
@@ -1473,7 +1473,7 @@ function create_bond_interface {
wait_for_ifstate $ifname UP 200 1
rc=$?
if [ $rc -ne 0 ]; then
log_error "Error! Interface \"$ifname\" was NOT in \"UP\" state eventually."
log_error "Interface \"$ifname\" could not be brought \"UP\"."
$ip link show $ifname \
| $sed -e 's/^/['$ifname' ip out >> /g' \
| log_lines info