Commit fa6795ed authored by Wolfgang Schweer's avatar Wolfgang Schweer
Browse files

Undo base-installer changes; these are actually unneeded.

parent cbdc0f2c

base-installer

+0 −9
Original line number Diff line number Diff line
@@ -48,13 +48,4 @@ 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.

# And keep this in sync with d-e-c/share/debian-edu-config/d-i/finish-install:

# the temporary configuration file is removed at the end of the 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

+0 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ debian-edu-install (2.10.13) UNRELEASED; urgency=medium 
  [ 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.