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

[pere at alioth.debian.org]

Author: pere
Date: 2013-05-07 00:11:29 +0000 (Tue, 07 May 2013)
New Revision: 79993

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/testsuite/ltsp
Log:
Rewrite LTSP testsuite check again, this time to force IPv4 as
IPv6 NFS mount at least when using localhost as the server name.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-05-06 20:05:06 UTC (rev 79992)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-05-07 00:11:29 UTC (rev 79993)
@@ -1,10 +1,15 @@
 debian-edu-config (1.704~svn) UNRELEASED; urgency=low
 
+  [ Wolfgang Schweer ]
   * tools/sssd-generate-config: According to man 5 sssd-krb5, the
     option 'krb5_kdcip' is still valid, but deprecated and should
     be replaced with 'krb5_server'.  (After this change related log
     file entries would no longer be added.)
 
+  [ Petter Reinholdtsen ]
+  * Rewrite LTSP testsuite check again, this time to force IPv4 as
+    IPv6 NFS mount at least when using localhost as the server name.
+
  -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 06 May 2013 21:48:32 +0200
 
 debian-edu-config (1.704~svn79965) wheezy-test; urgency=low

Modified: branches/wheezy/debian-edu-config/testsuite/ltsp
===================================================================
--- branches/wheezy/debian-edu-config/testsuite/ltsp	2013-05-06 20:05:06 UTC (rev 79992)
+++ branches/wheezy/debian-edu-config/testsuite/ltsp	2013-05-07 00:11:29 UTC (rev 79993)
@@ -104,12 +104,8 @@
     # 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.
-    myip=$(getent hosts "$myname"|awk '{print $1}')
-    case "$myip" in
-	*:*) # IPv6
-	    myip="[$myip]"
-	    ;;
-    esac
+    # 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
 	if mount $myip:$m /mnt; then
 	    echo "success: $0: mounting $myname:$m succeeded"