Browse Source

6in4: work around hanging wget process

SVN-Revision: 35408
Steven Barth 13 years ago
parent
commit
a0a91963af
2 changed files with 5 additions and 3 deletions
  1. 1 1
      package/network/ipv6/6in4/Makefile
  2. 4 2
      package/network/ipv6/6in4/files/6in4.sh

+ 1 - 1
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

+ 4 - 2
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
 	}
 }