[debian-edu-commits] [Git][debian-edu/debian-edu-install][master] pre-pkgsel: Cleanup after squid workaround removal from base-installer.

[WolfgangSchweer]

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


Commits:
94551728 by Wolfgang Schweer at 2018-10-01T11:34:42Z
pre-pkgsel: Cleanup after squid workaround removal from base-installer.

- - - - -


2 changed files:

- debian/changelog
- pre-pkgsel


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+debian-edu-install (2.10.14) UNRELEASED; urgency=medium
+
+  * pre-pkgsel: Cleanup after squid workaround removal from base-installer.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Sun, 30 Sep 2018 21:27:46 +0200
+
 debian-edu-install (2.10.13) unstable; urgency=medium
 
   [ Wolfgang Schweer ]


=====================================
pre-pkgsel
=====================================
@@ -103,12 +103,6 @@ install_required_pkg debian-edu-install
 
 edu-etcvcs commit
 
-# Clean up file added in base-installer, now that debian-edu-config is
-# installed (pulled in via debian-edu-install).
-rm -f /target/etc/apt/apt.conf.d/90squid-di
-
-edu-etcvcs commit
-
 hook=/target/usr/share/debian-edu-config/d-i/pre-pkgsel
 if [ -x $hook ] ; then
     log "Running debian-edu-config pre-pkgsel hook"



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/commit/94551728e11b302596e2278dfd33172da5352e53

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-install/commit/94551728e11b302596e2278dfd33172da5352e53
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/20181001/910b6c52/attachment-0001.html>