[debian-edu-commits] debian-edu/ 01/01: ltsp-build-client/Debian-custom/032-edu-pkgs: - Purge package modemmanager after checking that this has no side effects; adjust 60-edu-client.

[Wolfgang Schweer]

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

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

commit 46cf825d1aea7a1375e06cc185837de9eb527aa1
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Sat Oct 11 16:19:36 2014 +0200

    ltsp-build-client/Debian-custom/032-edu-pkgs: - Purge package modemmanager after checking that this has no side effects; adjust 60-edu-client.
---
 debian/changelog                                                | 4 +++-
 share/ltsp/init-ltsp.d/60-edu-client                            | 3 ---
 share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs | 3 +++
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 236a2fa..d24e0bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,11 +5,13 @@ debian-edu-config (1.810) UNRELEASED; urgency=high
     unsetting 'dbnosync' in slapd-debian-edu.conf.
   * share/ltsp/init-ltsp.d/60-edu-diskless-ws:
     - Use systemd tool to disable ltsp client services.
-    - Disable modemmanager for all client types.
     - Disable useless cups browse service on thin clients.
     - Disable other dm services if ldm is used.
   * Rename 60-edu-diskless-ws to 60-edu-client to better match the
     script's purpose.
+  * ltsp-build-client/Debian-custom/032-edu-pkgs:
+    - Purge package modemmanager after checking that this has no side
+      effects.
 
   [ Petter Reinholdtsen ]
   * Enable the auto flag in the PXE installation, to allow more settings
diff --git a/share/ltsp/init-ltsp.d/60-edu-client b/share/ltsp/init-ltsp.d/60-edu-client
index 45b257d..e0e782a 100644
--- a/share/ltsp/init-ltsp.d/60-edu-client
+++ b/share/ltsp/init-ltsp.d/60-edu-client
@@ -23,6 +23,3 @@ fi
 if ! boolean_is_true "$LTSP_FATCLIENT" ; then
     systemctl disable cups-browsed.service
 fi
-
-# Remove unneeded ModemManager for all LTSP client types.
-systemctl disable ModemManager.service
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 9ad3943..a29d58e 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
@@ -238,6 +238,9 @@ setup_diskless_workstation() {
     # No VPN nor serial network either
     in_target apt-get -y purge ppp
 
+    # No modem either
+    in_target apt-get -y purge modemmanager
+
     # Missing unique ID on the clients, so no use keeping it around
     in_target apt-get -y purge popularity-contest
 

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