2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 09:36:41 +00:00

Merge pull request #6188 from bybai/sle_slow

add wait ifstate since power NIC ifup is slower in test env
This commit is contained in:
zet809 2019-03-28 11:40:28 +08:00 committed by GitHub
commit b58ea242fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -693,10 +693,10 @@ elif [ "$1" = "-s" ];then
fi
if [ $networkmanager_active -eq 1 ]; then
nmcli con up $con_name
wait_for_ifstate $str_inst_nic UP 10 5
else
ifup $str_inst_nic
fi
wait_for_ifstate $str_inst_nic UP 20 5
fi
if [ $? -ne 0 ]; then
log_error "bring $str_inst_nic up failed."
@ -1109,10 +1109,10 @@ else
echo "bring up ip"
if [ $networkmanager_active -eq 1 ]; then
nmcli con up $con_name
wait_for_ifstate $str_nic_name UP 10 10
else
ifup $str_nic_name
fi
wait_for_ifstate $str_nic_name UP 20 5
if [ $? -ne 0 ]; then
log_error "bring $str_nic_name up failed."
error_code=1