[debian-edu-commits] r80483 - in trunk/src/debian-edu-config: debian testsuite

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-10 07:56:10 +0000 (Mon, 10 Jun 2013)
New Revision: 80483

Modified:
   trunk/src/debian-edu-config/debian/changelog
   trunk/src/debian-edu-config/testsuite/automount
Log:
Fix automount check, make sure it is skipped for Main-Server,
Roaming Workstation and Standalone profiles.  Copied from Wheezy
version.

Modified: trunk/src/debian-edu-config/debian/changelog
===================================================================
--- trunk/src/debian-edu-config/debian/changelog	2013-06-10 05:52:03 UTC (rev 80482)
+++ trunk/src/debian-edu-config/debian/changelog	2013-06-10 07:56:10 UTC (rev 80483)
@@ -12,6 +12,9 @@
   * Add postinst code to purge the leftover passwords from the debconf
     database when debian-edu-config is upgraded from a vulnerable
     version.
+  * Fix automount check, make sure it is skipped for Main-Server,
+    Roaming Workstation and Standalone profiles.  Copied from Wheezy
+    version.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sun, 09 Jun 2013 23:31:09 +0200
 

Modified: trunk/src/debian-edu-config/testsuite/automount
===================================================================
--- trunk/src/debian-edu-config/testsuite/automount	2013-06-10 05:52:03 UTC (rev 80482)
+++ trunk/src/debian-edu-config/testsuite/automount	2013-06-10 07:56:10 UTC (rev 80483)
@@ -5,8 +5,14 @@
 success() { echo "success: $0:" $@; }
 error() {   echo "error: $0:" $@; }
 
-# Automount is not used on the Main-Server and Standalone profiles
-if echo "$PROFILE" | egrep -q 'Main-Server|Standalone' ; then
+PROFILE=
+if test -r /etc/debian-edu/config ; then
+    . /etc/debian-edu/config
+fi
+
+# 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