From: Vasilis Tsiligiannis <acinonyx@openwrt.gr>
Date: Tue, 5 Apr 2011 16:37:16 +0000 (+0000)
Subject: quicktun: Improve QuickTun init script
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=87610ec4e1936608dbd156cc6be7308ebdbad059;p=openwrt%2Fsvn-archive%2Fpackages.git

quicktun: Improve QuickTun init script

The new init script won't fail if quicktun takes more than 1 second to start.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>

SVN-Revision: 26488
---

diff --git a/net/quicktun/files/quicktun.init b/net/quicktun/files/quicktun.init
index ae7bdd662..82caa26f0 100644
--- a/net/quicktun/files/quicktun.init
+++ b/net/quicktun/files/quicktun.init
@@ -60,12 +60,14 @@ start_service() {
 
 	eval env $OPTS "$SSD" -q -b -p "$PID" -m -x "$BIN" -S
 
-	sleep 1
+	while ! ifconfig "$interface" >/dev/null 2>&1; do
+		if ! $SSD -t -q -p $PID -x $BIN -K; then
+			echo "$s: daemon startup failed"
+			return 1
+		fi
 
-	if ! ifconfig "$interface" >/dev/null 2>&1; then
-		echo "$s: daemon startup failed"
-		return 1
-	fi
+		sleep 1
+	done
 
 	config_get up "$s" up
 	[ -n "$up" ] && sh -c "$up" - "$interface"