[debian-edu-commits] debian-edu/ 01/01: Adjust apt-get autoremoval operation. Don't act globally to avoid possible loss of configuration data, use it only package related:

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch upgrade-tmp
in repository debian-edu-config.

commit 2dac2c9d2bef0d6e35f9182745dadf60e2b04260
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sun Mar 15 01:24:30 2015 +0100

    Adjust apt-get autoremoval operation. Don't act globally to avoid possible loss of configuration data, use it only package related:
---
 cf/cf.apt        | 6 ------
 cf/cf.ldapclient | 8 ++++----
 debian/changelog | 5 +++++
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/cf/cf.apt b/cf/cf.apt
index c7d5fca..db948c6 100644
--- a/cf/cf.apt
+++ b/cf/cf.apt
@@ -23,9 +23,3 @@ shellcommands:
   debian::
 
     "/usr/sbin/debian-edu-hwsetup"
-
-# Remove unneeded packages at the end of the installation, in case we
-# removed something in the process.
-shellcommands:
-  debian.fifthpass::
-    "/usr/bin/apt-get autoremove -y"
diff --git a/cf/cf.ldapclient b/cf/cf.ldapclient
index 742f212..75a1d6d 100644
--- a/cf/cf.ldapclient
+++ b/cf/cf.ldapclient
@@ -85,20 +85,20 @@ shellcommands:
     # Workaround for bug #591773 in nslcd
     # FIXME Check if nslcd still pull in libpam-ldapd (bug #591773)
     debian.installation.!standalone::
-        "/usr/bin/apt-get purge -y libpam-ldapd"
+        "/usr/bin/apt-get --auto-remove purge -y libpam-ldapd"
 
     # Avoid multicast dns on stationary machines
     debian.installation.!standalone.!roaming::
-        "/usr/bin/apt-get purge -y libnss-mdns"
+        "/usr/bin/apt-get --auto-remove purge -y libnss-mdns"
 
     # Avoid Network Manager GUI client stationary machines.  The users
     # can not change the config anyway.
     debian.installation.!standalone.!roaming::
-        "/usr/bin/apt-get purge -y plasma-widget-networkmanagement"
+        "/usr/bin/apt-get --auto-remove purge -y plasma-widget-networkmanagement"
 
     # Avoid packages pulled in by cifs-utils (winbind being a Recommends) and
     # winbind (libpam-winbind and libnss-winbind will be purged along
     # with winbind).
     # FIXME Check if cifs-utils still pull in libpam-winbind (bug #706434).
     debian.installation::
-        "/usr/bin/apt-get purge -y winbind"
+        "/usr/bin/apt-get --auto-remove purge -y winbind"
diff --git a/debian/changelog b/debian/changelog
index 514fdc8..c2fcead 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,11 @@ debian-edu-config (1.818) UNRELEASED; urgency=medium
   * Adjust cf/cf.krb5client to avoid overwriting /etc/krb5.conf on the
     main server during upgrades. This way cfengine should be idempotent
     in its operation as it is expected to be. (Closes: #779642).
+  * Adjust apt-get autoremoval operation. Don't act globally to avoid
+    possible loss of configuration data, use it only package related:
+    - remove 'apt-get autoremove -y' from cf/cf.apt.
+    - add param '--auto-remove' to all apt-get purge commands
+      in cf/cf.ldapclient (Closes: #779646).
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 10 Mar 2015 18:23:11 +0100
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git