[debian-edu-commits] debian-edu/ 01/01: share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs: don't try to remove consolekit and openvpn as they aren't installed anymore. (Closes: #872152)

[Holger Levsen]

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

holger pushed a commit to branch master
in repository debian-edu-config.

commit 1b00e005b375047da9119849397c5f01221efaee
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Jan 15 14:36:30 2018 +0000

    share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs: don't try to remove consolekit and openvpn as they aren't installed anymore. (Closes: #872152)
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 debian/changelog                                                | 6 ++++++
 share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b7692b3..f1f7614 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,13 @@
 debian-edu-config (1.946) UNRELEASED; urgency=medium
 
+  [ Wolfgang Schweer ]
   * Add Depends on e2fsprogs. Thanks to Helmut Grohne. (Closes: #887195).
 
+  [ Holger Levsen ]
+  * share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs: don't try
+    to remove consolekit and openvpn as they aren't installed anymore.
+    (Closes: #872152)
+
  -- Wolfgang Schweer <wschweer at arcor.de>  Sun, 14 Jan 2018 22:29:26 +0100
 
 debian-edu-config (1.945) unstable; urgency=medium
diff --git a/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs b/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
index 69a7c25..fdbfa52 100644
--- a/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
+++ b/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
@@ -239,18 +239,12 @@ finalization_diskless_workstation() {
     in_target apt-get -y purge network-manager wpasupplicant \
 	network-manager-openvpn network-manager-pptp network-manager-vpnc
 
-    # Do not fail if openvpn isn't installed.  This is the case in Jessie
-    in_target apt-get -y purge openvpn || true
-
     # No VPN nor serial network either
     in_target apt-get -y purge ppp
 
     # No modem either
     in_target apt-get -y purge modemmanager
 
-    # consolekit is deprecated: replacement is systemd-logind.
-    in_target apt-get -y purge consolekit
-
     # cups isn't needed for LTSP clients to be able to print.
     in_target apt-get -y purge cups
 

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