From 5ac724b8d139b7e38c3a16c8752bad55076ea670 Mon Sep 17 00:00:00 2001
From: Jouke Witteveen <j.witteveen@gmail.com>
Date: Thu, 21 Jun 2012 12:19:53 +0200
Subject: Introduce polling timeout logic

This should fix FS#30361 along the way.
---
 src/network | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'src/network')

diff --git a/src/network b/src/network
index 1c466c7..02d74d7 100644
--- a/src/network
+++ b/src/network
@@ -372,17 +372,14 @@ interface_is_up() {
 # $2: the interface name
 bring_interface()
 {
-    local INTERFACE="$2" timeout="${UP_TIMEOUT:-5}"
+    local INTERFACE="$2"
     case "$1" in
         up)
             if ! ( eval $IFACE_UP ); then
                 return 1
             fi
             ip link set dev "$INTERFACE" up &>/dev/null
-            while ! interface_is_up "$INTERFACE"; do
-                (( timeout-- > 0 )) || return 1
-                sleep 1
-            done
+            timeout_wait "${UP_TIMEOUT:-5}" 'interface_is_up "$INTERFACE"' || return 1
         ;;
         flush|down)
             if ! ( eval $IFACE_DOWN ); then
-- 
cgit v1.2.3-24-g4f1b