export_mac_ip: PUB_NIC=$(ip route get 1.2.3.4 | awk '{print $5; exit}') PUB_IP=$( ip route get 1.2.3.4 | awk '{print $7; exit}')
network_ok: [ "$(cat $i/operstate)" = 'up' ]&& return 0
[ -n $pub_nic ] || return 1
[ "$(cat $i/operstate)" = 'up'] && export_ip_mac && return 0 [ "$(cat $i/carrier 2>/dev/null)" = '1' ] && export_ip_mac && return 0
ok
Thanks, Yinsi
when cat /sys/class/net/eth0/operstate is up, network is ok, then it will not sleep and immediately execute export_ip_mac(), but actually route is not ready, it can't get mac and ip by search route, so use ping can ensure save enough time for route.
Signed-off-by: Liu Yinsi liuyinsi@163.com
lib/bootstrap.sh | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/lib/bootstrap.sh b/lib/bootstrap.sh index b04ea3dd4..df25e99e0 100755 --- a/lib/bootstrap.sh +++ b/lib/bootstrap.sh @@ -87,13 +87,7 @@ net_devices_link()
network_ok() {
- local i
- for i in /sys/class/net/*/
- do
[ "${i#*/lo/}" != "$i" ] && continue[ "$(cat $i/operstate)" = 'up' ] && return 0[ "$(cat $i/carrier 2>/dev/null)" = '1' ] && return 0- done
ping -c 3 $LKP_SERVER > /dev/null && return 0
is_clearlinux && { net_devices_link up
-- 2.23.0