[debian-edu-commits] debian-edu/ 01/01: share/ltsp/init-ltsp.d/60-edu-diskless-ws: Stop using update-rc.d to disable the automounter if the homedir is mounted via sshfs as this isn't stable. Do it the way ltsp does.

[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 5b4f24998022b2c2974841289af221337eb5227e
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Sep 18 11:36:15 2014 +0200

    share/ltsp/init-ltsp.d/60-edu-diskless-ws: Stop using update-rc.d to disable the automounter if the homedir is mounted via sshfs as this isn't stable. Do it the way ltsp does.
---
 debian/changelog                          |  8 ++++++++
 share/ltsp/init-ltsp.d/60-edu-diskless-ws | 13 +++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 42c2630..3b56c89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debian-edu-config (1.803) UNRELEASED; urgency=high
+
+  * share/ltsp/init-ltsp.d/60-edu-diskless-ws:
+    Stop using update-rc.d to disable the automounter if the homedir is
+    mounted via sshfs as this isn't stable. Do it the way ltsp does.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 18 Sep 2014 11:29:19 +0200
+
 debian-edu-config (1.802) unstable; urgency=medium
 
   [ Wolfgang Schweer ]
diff --git a/share/ltsp/init-ltsp.d/60-edu-diskless-ws b/share/ltsp/init-ltsp.d/60-edu-diskless-ws
index 90f8de1..a0d5029 100644
--- a/share/ltsp/init-ltsp.d/60-edu-diskless-ws
+++ b/share/ltsp/init-ltsp.d/60-edu-diskless-ws
@@ -1,13 +1,6 @@
 #!/bin/sh
 # For Debian Edu diskless workstations (i.e. ltsp fat clients).
-if boolean_is_true "$LTSP_FATCLIENT"; then
-    if [ -z "$DEFAULT_DISPLAY_MANAGER" ]; then
-        # Disable autofs to let sshfs mount home dir (LDM is used).
-        update-rc.d autofs disable 2 >/dev/null  2>&1
-    else
-        # Enable services, just to be sure (kdm, gdm3 or lightdm is used).
-        for service in autofs nfs-common nslcd nscd ; do
-            update-rc.d $service enable 2 >/dev/null  2>&1
-        done
-    fi
+if boolean_is_true "$LTSP_FATCLIENT" && [ -z "$DEFAULT_DISPLAY_MANAGER" ]; then
+    # Remove autofs to let sshfs mount home dir (LDM is used).
+    rm -f /etc/rc?.d/???"autofs" "/etc/init.d/autofs" "/etc/init/autofs.conf"
 fi

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