[Trisquel-devel] [PATCH] Toutatis Fix #5141 Infinite wait in Ubiquity, needs testing w/ iso build

[Andrew M. Lindley]

Ubiquity installer waits infinitely when a server is down.  The bug is
in Trisquel code.  I have tested the code change of the patch by
modifying a Trisquel install USB key made from a 6.0 beta iso back
when the servers were flakey during beta.  That the patch builds a deb
using makepackage has also been tested.

However, until someone makes an iso, that the patch works exactly as
the very minor code change hasn't been tested.  If someone (perhaps
Francesco) can make me an iso I'll test on a virtual machine to
confirm the fix.

Leny2010 / Andrew

-- >8 --
Subject: [PATCH] Toutatis Fix #5141, Infinite wait in Ubiquity installer

---
 helpers/make-ubiquity |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helpers/make-ubiquity b/helpers/make-ubiquity
index 90b56b1..5b7a0a7 100644
--- a/helpers/make-ubiquity
+++ b/helpers/make-ubiquity
@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=2
+VERSION=3
 
 . ./config
 
@@ -57,7 +57,7 @@ for i in \$(grep 'tp:' /usr/share/python-apt/templates/Trisquel.mirrors)
 do
     echo Testing \$i
     TIME=\$(date +%s%N)
-    wget -o /dev/null -O /dev/null \$i/speedtest || continue
+    wget -T 60 -t 1 -o /dev/null -O /dev/null \$i/speedtest || continue
     TIME2=\$(date +%s%N)
     ELAPSED=\$(expr \$TIME2 - \$TIME)
     echo Time: \$ELAPSED
-- 
1.7.9.5