aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2013-01-30 09:05:53 +0000
committerSteven Barth <steven@midlink.org>2013-01-30 09:05:53 +0000
commit26312e0ff332e438ec77c45e208334ce259e0fee (patch)
tree548d71f1e3364a2285ac7f24bb25d173a31991f1
parent94169118a2a766957be32e798a2cfeb79dee1f7a (diff)
downloadupstream-26312e0ff332e438ec77c45e208334ce259e0fee.tar.gz
upstream-26312e0ff332e438ec77c45e208334ce259e0fee.tar.bz2
upstream-26312e0ff332e438ec77c45e208334ce259e0fee.zip
6in4: work around hanging wget process
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35408 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/network/ipv6/6in4/Makefile2
-rwxr-xr-xpackage/network/ipv6/6in4/files/6in4.sh6
2 files changed, 5 insertions, 3 deletions
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
}
}