[debian-edu-commits] r79889 - in branches/wheezy/debian-edu-config: debian testsuite

[pere at alioth.debian.org]

Author: pere
Date: 2013-05-01 16:40:12 +0000 (Wed, 01 May 2013)
New Revision: 79889

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/testsuite/automount
Log:
Fix automount check, make sure it is skipped for Main-Server and
Standalone profiles.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-05-01 16:33:11 UTC (rev 79888)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-05-01 16:40:12 UTC (rev 79889)
@@ -1,3 +1,11 @@
+debian-edu-config (1.704~svn79879) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Fix automount check, make sure it is skipped for Main-Server and
+    Standalone profiles.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Wed, 01 May 2013 18:39:13 +0200
+
 debian-edu-config (1.704~svn79878) wheezy-test; urgency=low
 
   [ Petter Reinholdtsen ]

Modified: branches/wheezy/debian-edu-config/testsuite/automount
===================================================================
--- branches/wheezy/debian-edu-config/testsuite/automount	2013-05-01 16:33:11 UTC (rev 79888)
+++ branches/wheezy/debian-edu-config/testsuite/automount	2013-05-01 16:40:12 UTC (rev 79889)
@@ -5,6 +5,11 @@
 success() { echo "success: $0:" $@; }
 error() {   echo "error: $0:" $@; }
 
+PROFILE=
+if test -r /etc/debian-edu/config ; then
+    . /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
     exit 0