[debian-edu-commits] r80011 - in branches/wheezy/debian-edu-config: cf debian share/debian-edu-config/tools testsuite

[pere at alioth.debian.org]

Author: pere
Date: 2013-05-07 10:46:12 +0000 (Tue, 07 May 2013)
New Revision: 80011

Modified:
   branches/wheezy/debian-edu-config/cf/cf.homes
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/setup-roaming
   branches/wheezy/debian-edu-config/testsuite/automount
Log:
Disable automounting on roaming workstation, that was enabled by
mistake, as it confuses libpam-mklocaluser.  Change cfengine rule
to not configure autofs, and change test suite to not check autofs
on this profile.

Modified: branches/wheezy/debian-edu-config/cf/cf.homes
===================================================================
--- branches/wheezy/debian-edu-config/cf/cf.homes	2013-05-07 10:32:37 UTC (rev 80010)
+++ branches/wheezy/debian-edu-config/cf/cf.homes	2013-05-07 10:46:12 UTC (rev 80011)
@@ -63,7 +63,7 @@
 
     # Enable autofs using LDAP unless running the server.  
     # This is done by enabling autofs. Use SRV RRs to find ldap.
-    debian.!server.!standalone::
+    debian.!server.!standalone.!roaming::
       { /etc/default/autofs
         AppendIfNoSuchLine "LDAPURI=ldap://$(ldapserver)"
       }

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-05-07 10:32:37 UTC (rev 80010)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-05-07 10:46:12 UTC (rev 80011)
@@ -3,6 +3,10 @@
   [ Petter Reinholdtsen ]
   * Add new filesystem testsuite check to report too full file
     systems, meaning file systems with less than 10% left.
+  * Disable automounting on roaming workstation, that was enabled by
+    mistake, as it confuses libpam-mklocaluser.  Change cfengine rule
+    to not configure autofs, and change test suite to not check autofs
+    on this profile.
 
  -- Petter Reinholdtsen <pere at debian.org>  Tue, 07 May 2013 12:31:29 +0200
 

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/tools/setup-roaming
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/tools/setup-roaming	2013-05-07 10:32:37 UTC (rev 80010)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/setup-roaming	2013-05-07 10:46:12 UTC (rev 80011)
@@ -75,5 +75,4 @@
 
 netgroup:       files sss
 sudoers:        files ldap
-automount:      files ldap
 EOF

Modified: branches/wheezy/debian-edu-config/testsuite/automount
===================================================================
--- branches/wheezy/debian-edu-config/testsuite/automount	2013-05-07 10:32:37 UTC (rev 80010)
+++ branches/wheezy/debian-edu-config/testsuite/automount	2013-05-07 10:46:12 UTC (rev 80011)
@@ -10,8 +10,9 @@
     . /etc/debian-edu/config
 fi
 
-# Automount is not used on the Main-Server and Standalone profiles
-if echo "$PROFILE" | egrep -q 'Main-Server|Standalone' ; then
+# Automount is not used on the Main-Server, Roaming workstation and
+# Standalone profiles.
+if echo "$PROFILE" | egrep -q 'Main-Server|Roaming-Workstation|Standalone' ; then
     exit 0
 fi