[debian-edu-commits] debian-edu/ 01/01: Add 30 second timeout and the number of tries to 3 in debian-edu- bless and ltsp script 000-arch-detection, to make sure blocked networks do not cause the installation to hang forever.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-config.

commit 482446eeb4a3d7e739ec0e9360825aa3cdc97a75
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Thu Oct 23 11:26:42 2014 +0200

    Add 30 second timeout and the number of tries to 3 in debian-edu- bless and ltsp script 000-arch-detection, to make sure blocked networks do not cause the installation to hang forever.
---
 debian/changelog                                                     | 5 ++++-
 share/debian-edu-config/tools/debian-edu-bless                       | 2 +-
 .../ltsp/plugins/ltsp-build-client/Debian-custom/000-arch-detection  | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 96f6bed..515d74a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,11 @@ debian-edu-config (1.813) UNRELEASED; urgency=low
 
   * Make LTSP mirror editing more robust.  Do not add corrupt APT source
     when no dist value is set and only add our local mirror if it exist.
+  * Add 30 second timeout and the number of tries to 3 in debian-edu-
+    bless and ltsp script 000-arch-detection, to make sure blocked
+    networks do not cause the installation to hang forever.
 
- -- Petter Reinholdtsen <pere at debian.org>  Thu, 23 Oct 2014 10:30:10 +0200
+ -- Petter Reinholdtsen <pere at debian.org>  Thu, 23 Oct 2014 10:35:10 +0200
 
 debian-edu-config (1.812) unstable; urgency=low
 
diff --git a/share/debian-edu-config/tools/debian-edu-bless b/share/debian-edu-config/tools/debian-edu-bless
index 351d1cc..456bab1 100644
--- a/share/debian-edu-config/tools/debian-edu-bless
+++ b/share/debian-edu-config/tools/debian-edu-bless
@@ -96,7 +96,7 @@ apt_get_harder "apt-get install -y etckeeper"
 MIRROR=ftp.skolelinux.org
 DIRECTORY=/skolelinux
 sourcefile=/etc/apt/sources.list.d/debian-edu.list
-if wget -qO - http://$MIRROR$DIRECTORY/dists/$EDUSUITE/Release | grep -q " local/binary" ; then 
+if wget --timeout=30 --tries=3 -qO - http://$MIRROR$DIRECTORY/dists/$EDUSUITE/Release | grep -q " local/binary" ; then 
     echo "info: Enabling our local APT source from $MIRROR."
     apt_get_harder "apt-get install -y debian-edu-archive-keyring"
     cat <<EOF > $sourcefile
diff --git a/share/ltsp/plugins/ltsp-build-client/Debian-custom/000-arch-detection b/share/ltsp/plugins/ltsp-build-client/Debian-custom/000-arch-detection
index e506344..5af5081 100644
--- a/share/ltsp/plugins/ltsp-build-client/Debian-custom/000-arch-detection
+++ b/share/ltsp/plugins/ltsp-build-client/Debian-custom/000-arch-detection
@@ -19,7 +19,7 @@ case $MODE in
 		NEWMIRROR=$(awk '/^deb (http|ftp):\/\/.* main/ { if (!first) { print $2; first=1 } }' < /etc/apt/sources.list)
 		echo "info: Changing LTSP mirror from '$option_mirror_value' to '$NEWMIRROR'"
 		option_mirror_value=$NEWMIRROR
-		if wget -qO - http://ftp.skolelinux.org/skolelinux/dists/$option_dist_value/Release | grep -q " local/binary" ; then 
+		if wget --timeout=30 --tries=3 -qO - http://ftp.skolelinux.org/skolelinux/dists/$option_dist_value/Release | grep -q " local/binary" ; then 
 		    option_extra_mirror_value="http://ftp.skolelinux.org/skolelinux/ $option_dist_value local"
 		    echo "info: Added LTSP extra mirror '$option_extra_mirror_value'"
 		fi

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git