[debian-edu-commits] debian-edu/ 03/04: Avoid to show error messages on LTSP diskless workstation boot.

[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 7c1834cef679f5dbbefac2b060402dccbbef43cc
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Mon Jan 22 20:36:14 2018 +0100

    Avoid to show error messages on LTSP diskless workstation boot.
    
     share/ltsp/init-ltsp.d/60-edu-client: Fix condition to work in all cases.
---
 share/ltsp/init-ltsp.d/60-edu-client | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/share/ltsp/init-ltsp.d/60-edu-client b/share/ltsp/init-ltsp.d/60-edu-client
index 1795ed5..9488275 100644
--- a/share/ltsp/init-ltsp.d/60-edu-client
+++ b/share/ltsp/init-ltsp.d/60-edu-client
@@ -1,10 +1,11 @@
 service_disable() {
     service="$1"
-    if [ systemd = "$BOOTSYSTEM" ] \
-	&& [ -f /lib/systemd/system/${service}.service ] ; then
-	systemctl disable ${service}.service
-    else
-        update-rc.d $service disable || true
+    if [ -f /lib/systemd/system/${service}.service ] ; then
+        if [ systemd = "$BOOTSYSTEM" ] ; then
+	    systemctl disable ${service}.service
+        else
+            service $service disable || true
+        fi
     fi
 }
 
@@ -20,6 +21,7 @@ if [ -z "$DEFAULT_DISPLAY_MANAGER" ]; then
     for service in \
         lightdm \
         gdm3 \
+        sddm \
       ; do
         service_disable $service
     done

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