[debian-edu-commits] r81204 - in branches/wheezy/debian-edu-config: debian share/ltsp/init-ltsp.d

[schweer-guest at alioth.debian.org]

Author: schweer-guest
Date: 2013-06-27 19:30:03 +0000 (Thu, 27 Jun 2013)
New Revision: 81204

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-diskless-ws
Log:
ltsp/init-ltsp.d/60-edu-diskless-ws: Disable autofs to reenable
login on diskless workstations when ldm is used. Drop code to fix
nsswitch.conf, as this is already done otherwise.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-06-27 19:16:02 UTC (rev 81203)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-06-27 19:30:03 UTC (rev 81204)
@@ -1,3 +1,11 @@
+debian-edu-config (1.708~svn) UNRELEASED; urgency=low
+
+  * ltsp/init-ltsp.d/60-edu-diskless-ws: Disable autofs to reenable
+    login on diskless workstations when ldm is used. Drop code to fix
+    nsswitch.conf, as this is already done otherwise.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 27 Jun 2013 21:27:49 +0200
+
 debian-edu-config (1.708~svn81203) wheezy-test; urgency=low
 
   [ Petter Reinholdtsen ]

Modified: branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-diskless-ws
===================================================================
--- branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-diskless-ws	2013-06-27 19:16:02 UTC (rev 81203)
+++ branches/wheezy/debian-edu-config/share/ltsp/init-ltsp.d/60-edu-diskless-ws	2013-06-27 19:30:03 UTC (rev 81204)
@@ -1,13 +1,15 @@
 #!/bin/sh
 # For Debian Edu diskless workstations (i.e. ltsp fat clients).
-# As dns service is available, modify priority to make KERBEROS work.
 if boolean_is_true "$LTSP_FATCLIENT"; then
-    sed -i '/automount/ s/files\ ldap/ldap/' /etc/nsswitch.conf
-    sed -i s/files\ myhostname\ dns/dns\ files/ /etc/nsswitch.conf
-    # Enable services.
-    for service in autofs nfs-common nslcd nscd ; do
-        update-rc.d $service enable 2
-    done
+    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
     # Fix proxy setting
     dhclient -nw
 fi