diff options
| author | Simon Rettberg | 2019-09-03 16:28:01 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2019-09-03 16:28:01 +0200 |
| commit | 35efe1842682ef9c08442ca156573d2036d54a45 (patch) | |
| tree | 318bcf63e9121b9fca724392c8299fe12baf0cce | |
| parent | [rootfs-stage31] Somehow fix arithmetic error (diff) | |
| download | mltk-35efe1842682ef9c08442ca156573d2036d54a45.tar.gz mltk-35efe1842682ef9c08442ca156573d2036d54a45.tar.xz mltk-35efe1842682ef9c08442ca156573d2036d54a45.zip | |
[rootfs-stage31] wait_for_iface: Consider carrier state too
| -rw-r--r-- | core/rootfs/rootfs-stage31/data/inc/network.functions | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/core/rootfs/rootfs-stage31/data/inc/network.functions b/core/rootfs/rootfs-stage31/data/inc/network.functions index 853c0cb3..a027ea63 100644 --- a/core/rootfs/rootfs-stage31/data/inc/network.functions +++ b/core/rootfs/rootfs-stage31/data/inc/network.functions @@ -3,21 +3,32 @@ wait_for_iface() { local DEVICE=$1 local TIMEOUT=10 - local state laststate + local state laststate current relax + local want= [ -n "$2" ] && TIMEOUT="$2" echo -n "Waiting ${TIMEOUT}s for interface $DEVICE: " TIMEOUT="$(( TIMEOUT * 2 ))" # Some systems don't have operstate. Seems to be hardware dependent [ -e "/sys/class/net/${DEVICE}/operstate" ] || sleep 1 - if [ -e "/sys/class/net/${DEVICE}/operstate" ]; then + [ -e "/sys/class/net/${DEVICE}/operstate" ] && want="up" + [ -e "/sys/class/net/${DEVICE}/carrier" ] && want="${want}1" + if [ -n "$want" ]; then + relax=$(( TIMEOUT / 3 )) + [ "$relax" -lt 8 ] && relax=8 + current=0 while true; do # check linkstate - state="$(cat "/sys/class/net/${DEVICE}/operstate")" + state="$( cat "/sys/class/net/${DEVICE}/operstate" 2> /dev/null )" + state="${state}$( cat "/sys/class/net/${DEVICE}/carrier" 2> /dev/null )" [ "$state" != "$laststate" ] && echo -n "[$state]" laststate="$state" - [ "$state" = "up" ] && break - TIMEOUT=$(( TIMEOUT - 1 )) # don't wait forever, the pcnet iface of vmware will never be "up" although it's working - if [ "$TIMEOUT" -le 0 ];then + [ "$state" = "$want" ] && break + if [ "$current" -gt "$relax" ] && [ "$state" = "unknown1" ]; then + echo -n "better than nothing" + break + fi + current=$(( current + 1 )) # don't wait forever, the pcnet iface of vmware will never be "up" although it's working + if [ "$current" -ge "$TIMEOUT" ];then echo -n "TIMEOUT" break fi @@ -28,7 +39,7 @@ wait_for_iface() { else # we really don't have a operstate .. then just wait a sec and hope for the best. sleep 1 - echo -n "... no operstate, let's hope for the best..." + echo -n "... no operstate or carrier, let's hope for the best..." fi echo } |