Commit 890d8ae3 authored by Wolfgang Schweer's avatar Wolfgang Schweer
Browse files

share/debian-edu-config/d-i/finish-install: Undo actually unneeded changes.

parent 1a68392e
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
debian-edu-config (2.10.37) UNRELEASED; urgency=medium

  * share/debian-edu-config/d-i/finish-install:
    - Remove temporary apt configuration. This reverts the modification done in
      d-e-i/base-installer to get back the default apt behaviour for the
      installed system.
  * Fix squid configuration now that systemd support has been added to squid
    and /etc/default/squid isn't used anymore:
    - cf3/cf.squid: Link our configuration as /etc/squid/squid.conf, adjust
+0 −8
Original line number Diff line number Diff line
@@ -61,14 +61,6 @@ edu-etcvcs commit
) < /dev/null 2>&1 3>/dev/null 4>&3 5>&3 6>&3 | logger -t edu-entropy-add &
epid=$!

# Remove temporary apt configuration for LTSP installation. Keep this in sync
# with d-e-i/base-installer.
if in-target rm /etc/apt/apt.conf.d/01keep-pkgs ; then
    log "info: Removing temporary apt configuration workaround"
else
    log "error: '/etc/apt/apt.conf.d/01keep-pkgs' is missing"
fi

# Make the installation look more like a finished system, to make sure
# debconf-get-selections --installer work.
. /usr/lib/finish-install.d/94save-logs