[debian-edu-commits] [Git][debian-edu/debian-edu-config][master] 2 commits: share/debian-edu-config/d-i/finish-install: Remove temporary apt configuration.

[WolfgangSchweer]

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


Commits:
06a5fbd8 by Wolfgang Schweer at 2018-09-19T08:10:44Z
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.

- - - - -
5a8cca0c by Wolfgang Schweer at 2018-09-19T08:18:25Z
debian/changelog: Document changes from last commit.

- - - - -


2 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+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.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Wed, 19 Sep 2018 10:17:02 +0200
+
 debian-edu-config (2.10.36) unstable; urgency=medium
 
   [ Mike Gabriel ]


=====================================
share/debian-edu-config/d-i/finish-install
=====================================
@@ -61,6 +61,12 @@ 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.
+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.



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/abb26b0848a9062ec936cdc39376ab929f8dc25a...5a8cca0cc33a6c965d8f0cfdd88e896a950367c2

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-config/compare/abb26b0848a9062ec936cdc39376ab929f8dc25a...5a8cca0cc33a6c965d8f0cfdd88e896a950367c2
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/b4030db3/attachment-0001.html>