[debian-edu-commits] debian-edu/ 01/01: Test internet connectivity against deb.debian.org instead of using ftp.debian.org.
Wolfgang Schweer
schweer-guest at moszumanska.debian.org
Sun Nov 26 22:37:18 UTC 2017
This is an automated email from the git hooks/post-receive script.
schweer-guest pushed a commit to branch master
in repository debian-edu-install.
commit 1ae97d1620f20c0e176d3f9577494a79c41065dd
Author: Wolfgang Schweer <wschweer at arcor.de>
Date: Sun Nov 26 23:36:44 2017 +0100
Test internet connectivity against deb.debian.org instead of using ftp.debian.org.
---
debian-edu-profile | 2 +-
debian/changelog | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/debian-edu-profile b/debian-edu-profile
index 954b9b6..8777f93 100755
--- a/debian-edu-profile
+++ b/debian-edu-profile
@@ -475,7 +475,7 @@ if [ -f /cdrom/.disk/cd_type ] && egrep -iq 'dvd|bluray' /cdrom/.disk/cd_type; t
db_set "apt-setup/use_mirror" false
db_fset "apt-setup/use_mirror" seen true || true
log "disabling mirror selection on dvd's"
-elif ! log-output wget -U "Wget, Debian Edu d-i $de_suite $archstr" -qO - http://ftp.debian.org/debian/README && \
+elif ! log-output wget -U "Wget, Debian Edu d-i $de_suite $archstr" -qO - http://deb.debian.org/debian/README && \
! log-output wget --no-proxy -U "Wget, Debian Edu d-i $de_suite $archstr" -qO - http://ftp.debian.org/debian/README ; then
db_settitle debian-edu-install/no-network/title
db_input critical "debian-edu-install/no-network" || true
diff --git a/debian/changelog b/debian/changelog
index dc0027d..3d40a30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ debian-edu-install (1.920) UNRELEASED; urgency=medium
command line (or in expert mode via d-i gui) if on a network with
a running DHCPD server or on a network with NAT enabled on the gateway
and manual network configuration on the client.
+ Test internet connectivity against deb.debian.org instead of using
+ ftp.debian.org.
* preseed-values/defaults.common: Fix default mirror setting.
- Use deb.debian.org instead of http.debian.net.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-install.git
More information about the debian-edu-commits
mailing list