[debian-edu-commits] debian-edu/ 01/01: Extend LTSP test to report error if no LTSP NFS mount point exist.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-config.

commit 875125a57f91fdd62696925d9b4630b12de5d1a9
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Sep 26 15:13:14 2014 +0200

    Extend LTSP test to report error if no LTSP NFS mount point exist.
---
 debian/changelog | 1 +
 testsuite/ltsp   | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 95c8510..2b8b708 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ debian-edu-config (1.806) UNRELEASED; urgency=low
   * Rewrite LTSP test to use nc instead of telnet.  Telnet is not
     installed by default any more.  Depend on netcat to get a nc
     implementation.
+  * Extend LTSP test to report error if no LTSP NFS mount point exist.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 25 Sep 2014 23:56:27 +0200
 
diff --git a/testsuite/ltsp b/testsuite/ltsp
index aba70fd..f85b41f 100755
--- a/testsuite/ltsp
+++ b/testsuite/ltsp
@@ -106,12 +106,17 @@ if echo "$PROFILE" | grep -q Thin-Client-Server ; then
     # Workaround: use IP, just in case fqdn is not yet set in GOsa.
     # FIXME Force IPv4 because NFS mount hang some times when trying IPv6 (for myname=localhost)
     myip=$(dig -4 "$myname" +short)
-    for m in $(showmount -e | grep /opt/ltsp | awk '{print $1}') ; do
+    foundnfs=false
+    for m in $(showmount -e $myip | grep /opt/ltsp | awk '{print $1}') ; do
 	if mount $myip:$m /mnt; then
 	    echo "success: $0: mounting $myname:$m succeeded"
 	    umount /mnt
+	    foundnfs=true
 	else
 	    echo "error: $0: unable to mount $myname:$m"
 	fi
     done
+    if [ false = "$foundnfs" ] ; then
+	echo "error: $0: unable to find any NFS mount points on $myname"
+    fi
 fi

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