[debian-edu-commits] debian-edu/ 01/01: Stop using our own apt archive on ftp.skolelinux.org, see #836375.

[Holger Levsen]

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

holger pushed a commit to branch master
in repository debian-edu-install.

commit 2d51ecb542f2c85d4b24b9c6466d577c06d4156e
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Sep 2 14:22:29 2016 +0200

    Stop using our own apt archive on ftp.skolelinux.org, see #836375.
    
    * Stop using our own apt archive on ftp.skolelinux.org, see #836375:
      - debian/control: remove depends on debian-edu-archive-keyring-udeb.
      - pre-pkgsel: don't install the udeb and thus don'r run apt-update.
      - debian-edu-profile: drop d-i preseeding for local0 repository,
        also use ftp.debian.org to test whether the network is up.
---
 debian-edu-profile | 18 +-----------------
 debian/changelog   | 10 ++++++++++
 debian/control     |  1 -
 pre-pkgsel         |  6 ------
 4 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/debian-edu-profile b/debian-edu-profile
index c7c8fdc..de723e8 100755
--- a/debian-edu-profile
+++ b/debian-edu-profile
@@ -469,23 +469,13 @@ else
    de_suite="$DISTRIBUTION"
 fi
 
-db_register debian-installer/dummy apt-setup/local0/repository
-db_register debian-installer/dummy apt-setup/local0/comment
-db_register debian-installer/dummy apt-setup/local0/source
-db_register debian-installer/dummy apt-setup/local0/key
-
 archstr=$(/bin/archdetect)
 if [ -f /cdrom/.disk/cd_type ] && egrep -iq 'dvd|bluray' /cdrom/.disk/cd_type; then
     #disable mirror usage if we install from dvd or the usb sticks
     db_set "apt-setup/use_mirror" false 
     db_fset "apt-setup/use_mirror" seen true || true
     log "disabling mirror selection on dvd's"
-    # Make sure it is disabled
-    db_set "apt-setup/local0/comment" "" || true
-    db_set "apt-setup/local0/repository" "" || true
-    db_set "apt-setup/local0/source" true || true
-
-elif ! log-output wget -U "Wget, Debian Edu d-i $de_suite $archstr" -qO - http://ftp.skolelinux.org/welcome.msg ; then
+elif ! log-output wget -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
     db_go || true
@@ -495,12 +485,6 @@ else
     log "We will have net, enable the mirrors"
     db_set "apt-setup/use_mirror" true
     db_fset "apt-setup/use_mirror" seen true || true
-    #preseed  skolelinux repo active
-    db_set "apt-setup/local0/comment" "Debian Edu $de_suite repository" || true
-    db_set "apt-setup/local0/repository" "http://ftp.skolelinux.org/skolelinux $de_suite local" || true
-    db_set "apt-setup/local0/source" true || true
-    #key must be available, if not apt-setup ignores our repo. 
-    db_set "apt-setup/local0/key" "http://ftp.skolelinux.org/pub/debian-edu-archive.key" || true
 fi
 
 
diff --git a/debian/changelog b/debian/changelog
index 2d784fa..6c00689 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+debian-edu-install (1.906) UNRELEASED; urgency=medium
+
+  * Stop using our own apt archive on ftp.skolelinux.org, see #836375:
+    - debian/control: remove depends on debian-edu-archive-keyring-udeb.
+    - pre-pkgsel: don't install the udeb and thus don'r run apt-update.
+    - debian-edu-profile: drop d-i preseeding for local0 repository,
+      also use ftp.debian.org to test whether the network is up.
+
+ -- Holger Levsen <holger at debian.org>  Fri, 02 Sep 2016 14:19:16 +0200
+
 debian-edu-install (1.905) unstable; urgency=medium
 
   [ Wolfgang Schweer ]
diff --git a/debian/control b/debian/control
index 7280d7d..915849e 100644
--- a/debian/control
+++ b/debian/control
@@ -48,7 +48,6 @@ Section: debian-installer
 Depends: ${misc:Depends},
          clock-setup,
          configured-network,
-         debian-edu-archive-keyring-udeb,
          debian-edu-profile-udeb,
          driver-injection-disk-detect,
          ltsp-client-builder,
diff --git a/pre-pkgsel b/pre-pkgsel
index 1648126..a2a1c88 100755
--- a/pre-pkgsel
+++ b/pre-pkgsel
@@ -95,12 +95,6 @@ edu-etcvcs commit
 
 log "asking for a few extra packages to be installed"
 
-# our local archive keyring, update apt database after it is installed
-install_required_pkg debian-edu-archive-keyring
-
-log "update mirrors using the latest keys"
-in-target apt-get update || true
-
 # education tasksel tasks
 install_required_pkg education-tasks
 

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