[debian-edu-commits] debian-edu/ 01/01: Also set mirror/http/mirror when installing from DVD/USB stick.

[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 1a807fbbd5b926d46488cff6471e7b7016a03280
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Thu Nov 20 15:30:14 2014 +0100

    Also set mirror/http/mirror when installing from DVD/USB stick.
---
 debian/changelog           | 3 +++
 sbin/debian-edu-pxeinstall | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a726785..a1c1fc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,9 @@ debian-edu-config (1.814) UNRELEASED; urgency=low
     from the installed system to the preseed file to avoid manual
     selection during PXE installations. (Closes: #770302).
 
+  [ Petter Reinholdtsen ]
+  * Also set mirror/http/mirror when installing from DVD/USB stick.
+
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 01 Nov 2014 07:25:41 +0100
 
 debian-edu-config (1.813) unstable; urgency=medium
diff --git a/sbin/debian-edu-pxeinstall b/sbin/debian-edu-pxeinstall
index ef2c2e4..4d5df0b 100755
--- a/sbin/debian-edu-pxeinstall
+++ b/sbin/debian-edu-pxeinstall
@@ -236,13 +236,15 @@ d-i apt-setup/local0/source boolean true
 EOF
     fi
 
-    # No use copying the installation mirror setting if a DVD was used
-    if grep -qi dvd /etc/apt/sources.list ; then
+    # No use copying the installation mirror setting if a DVD or USB
+    # stick was used.
+    if grep -qi 'dvd|bd' /etc/apt/sources.list ; then
 cat <<EOF
 
 # Avoid questions about mirrors, using manual setup
 choose-mirror-bin     mirror/country          string  manual
 choose-mirror-bin     mirror/protocol select  http
+choose-mirror-bin     mirror/http/mirror      select
 choose-mirror-bin     mirror/http/hostname    string  http.debian.net
 choose-mirror-bin     mirror/http/directory   string  /debian
 EOF

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