[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] share/debian-edu-config/d-i/finish-install: Undo actually unneeded changes.

[WolfgangSchweer]

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


Commits:
890d8ae3 by Wolfgang Schweer at 2018-09-19T19:58:03Z
share/debian-edu-config/d-i/finish-install: Undo actually unneeded changes.

- - - - -


2 changed files:

- debian/changelog
- share/debian-edu-config/d-i/finish-install


Changes:

=====================================
debian/changelog
=====================================
@@ -1,9 +1,5 @@
 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


=====================================
share/debian-edu-config/d-i/finish-install
=====================================
@@ -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



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/890d8ae3d7309059d62fcd618931f78e9669759b

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/commit/890d8ae3d7309059d62fcd618931f78e9669759b
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/37251eec/attachment.html>