[debian-edu-commits] debian-edu/ 01/01: Adjust LTSP check in testsuite, to mount using hostname and not IP, now that libnss-myhostname is installed on the machines. This fixes the check result on machines not yet added to DNS.

[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 4125623d3b1e0f8160bab41a7ad2cd9c9e1cf8fe
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Mon Oct 20 13:12:13 2014 +0200

    Adjust LTSP check in testsuite, to mount using hostname and not IP, now that libnss-myhostname is installed on the machines.  This fixes the check result on machines not yet added to DNS.
---
 debian/changelog | 6 ++++++
 testsuite/ltsp   | 7 ++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a6f3fd4..9b5a0d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,17 @@
 debian-edu-config (1.811) UNRELEASED; urgency=high
 
+  [ Wolfgang Schweer ]
   * ltsp-build-client/Debian-custom/032-edu-pkgs:
     - Purge package cups cause the package isn't needed for printing on
       thin clients and diskless workstations.
     - Purge all packages with status 'rc' by adding '--purge' to
       apt-get -y autoremove'.
 
+  [ Petter Reinholdtsen ]
+  * Adjust LTSP check in testsuite, to mount using hostname and not IP,
+    now that libnss-myhostname is installed on the machines.  This fixes
+    the check result on machines not yet added to DNS.
+
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 16 Oct 2014 15:45:54 +0200
 
 debian-edu-config (1.810) unstable; urgency=high
diff --git a/testsuite/ltsp b/testsuite/ltsp
index f85b41f..fe19f76 100755
--- a/testsuite/ltsp
+++ b/testsuite/ltsp
@@ -103,12 +103,9 @@ if echo "$PROFILE" | grep -q Thin-Client-Server ; then
 
     # Test if the LTSP chroots can be NFS mounted
     myname=$(uname -n)
-    # 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)
     foundnfs=false
-    for m in $(showmount -e $myip | grep /opt/ltsp | awk '{print $1}') ; do
-	if mount $myip:$m /mnt; then
+    for m in $(showmount -e $myname | grep /opt/ltsp | awk '{print $1}') ; do
+	if mount $myname:$m /mnt; then
 	    echo "success: $0: mounting $myname:$m succeeded"
 	    umount /mnt
 	    foundnfs=true

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