[debian-edu-commits] [Git][debian-edu/debian-edu-install][master] 3 commits: base-installer: Add temporary apt configuration (don't clean apt cache).

[WolfgangSchweer]

WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-install


Commits:
19168df6 by Wolfgang Schweer at 2018-09-19T07:40:29Z
base-installer: Add temporary apt configuration (don't clean apt cache).

This configuration re-enables the use of downloaded packages to speed up LTSP
chroot installation. It is removed during finish-install (via d-e-c).

- - - - -
36647a6d by Wolfgang Schweer at 2018-09-19T07:47:06Z
debian/debian-edu-profile-udeb.postinst: Prevent pkgsel from running apt clean.

This is part of the d-i modification to improve the LTSP installation. The apt
cache is cleaned up anyway at the very end of the installation.

- - - - -
a39de601 by Wolfgang Schweer at 2018-09-19T08:06:10Z
debian/changelog: Document apt (LTSP chroot) related modifications inside d-i.

- - - - -


3 changed files:

- base-installer
- debian/changelog
- debian/debian-edu-profile-udeb.postinst


Changes:

=====================================
base-installer
=====================================
@@ -48,4 +48,11 @@ else
         log "trusted.gpg already exists under /etc/apt in target"
 fi
 
+# Unlike apt-get, apt removes debs from the cache once installed successfully.
+# Keep them to benefit (again) from cached debs for LTSP chroot installation.
+log "adding /etc/apt/apt.conf.d/01keep-pkgs to speed up LTSP installation."
+cat > /target/etc/apt/apt.conf.d/01keep-pkgs <<EOF
+Binary::apt::APT::Keep-Downloaded-Packages "true";
+EOF
+
 disable_exception


=====================================
debian/changelog
=====================================
@@ -1,7 +1,17 @@
 debian-edu-install (2.10.13) UNRELEASED; urgency=medium
 
+  [ Holger Levsen ]
   * Bump standards version to 4.2.1, no changes needed.
 
+  [ Wolfgang Schweer ]
+  * Re-enable the use of already downloaded packages to speed up LTSP chroot
+    installation:
+    - base-installer: Add temporary apt configuration (don't clean apt cache);
+      it is removed during finish-install (via d-e-c).
+    - debian/debian-edu-profile-udeb.postinst: Prevent pkgsel from running
+      'apt-get clean'; the cache is cleaned anyway at the very end of the
+      installation.
+
  -- Holger Levsen <holger at debian.org>  Mon, 27 Aug 2018 12:05:04 +0200
 
 debian-edu-install (2.10.12) unstable; urgency=medium


=====================================
debian/debian-edu-profile-udeb.postinst
=====================================
@@ -7,8 +7,11 @@ set -e
 # Get rid of setting DEBIAN_TASKS_ONLY (introduced by pkgsel-udeb 0.45)
 # to allow the installation of education tasks in the target chroot,
 # where this setting is evaluated (since tasksel 3.39).
+# Don't run 'apt-get clean', keep packages for LTSP chroot installation; this
+# command will be run later (at the very end of the installation).
 if [ -e /var/lib/dpkg/info/pkgsel.postinst ] ; then
-    sed -i s/DEBIAN_TASKS_ONLY=1// /var/lib/dpkg/info/pkgsel.postinst
+    sed -i s/DEBIAN_TASKS_ONLY=1// /var/lib/dpkg/info/pkgsel.postinst;
+    sed -i '/apt-get clean/d' /var/lib/dpkg/info/pkgsel.postinst
 fi
 
 # Ask about which profile to install.



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/compare/c929a1589df31cbdb2a9904ec82178e3542dd17e...a39de601a03dea9c8522baaa496b6986708c7269

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/compare/c929a1589df31cbdb2a9904ec82178e3542dd17e...a39de601a03dea9c8522baaa496b6986708c7269
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20180919/b3c508b0/attachment-0001.html>