From 3005ab000218079e3a75c4b93629a90b3c0e6b60 Mon Sep 17 00:00:00 2001 From: cyrus Date: Wed, 30 Jan 2013 09:05:53 +0000 Subject: 6in4: work around hanging wget process git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35408 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/network/ipv6/6in4/Makefile | 2 +- package/network/ipv6/6in4/files/6in4.sh | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'package') diff --git a/package/network/ipv6/6in4/Makefile b/package/network/ipv6/6in4/Makefile index cddf0372e5..7090234358 100644 --- a/package/network/ipv6/6in4/Makefile +++ b/package/network/ipv6/6in4/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=6in4 -PKG_VERSION:=13 +PKG_VERSION:=14 PKG_RELEASE:=1 include $(INCLUDE_DIR)/package.mk diff --git a/package/network/ipv6/6in4/files/6in4.sh b/package/network/ipv6/6in4/files/6in4.sh index ef25322346..e27e86ef08 100755 --- a/package/network/ipv6/6in4/files/6in4.sh +++ b/package/network/ipv6/6in4/files/6in4.sh @@ -65,8 +65,10 @@ proto_6in4_setup() { local max=3 while [ $((++try)) -le $max ]; do - wget -qO/dev/null "$url" 2>/dev/null && break - sleep 1 + ( wget -qO/dev/null "$url" 2>/dev/null ) & + local pid=$! + ( sleep 5; kill $pid 2>/dev/null ) & + wait $pid && break done } } -- cgit v1.2.3