[debian-edu-commits] debian-edu/ 01/01: Adjust testsuite/pxeinstall now that atftpd isn't available and tftpd-hpa is used.

[Wolfgang Schweer]

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

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

commit 8c80123d2ceb7678c657e649a8a0d08769b46cf8
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Mon Aug 22 01:34:35 2016 +0200

    Adjust testsuite/pxeinstall now that atftpd isn't available and tftpd-hpa is used.
---
 debian/changelog     |  2 ++
 testsuite/pxeinstall | 14 ++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2957788..e0998be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ debian-edu-config (1.909) UNRELEASED; urgency=medium
   * ldap-bootstrap/sudo.ldif: Replace tjener with tjener.intern cause sudoHost
     now needs the FQDN as value for sudo-ldap to work.
   * Fix testsuite/samba to actually report success if 'net time' is working.
+  * Adjust testsuite/pxeinstall now that atftpd isn't available and tftpd-hpa
+    is used.
 
  -- Holger Levsen <holger at debian.org>  Fri, 19 Aug 2016 12:46:37 +0200
 
diff --git a/testsuite/pxeinstall b/testsuite/pxeinstall
index ef1a35d..6184fa6 100755
--- a/testsuite/pxeinstall
+++ b/testsuite/pxeinstall
@@ -20,20 +20,22 @@ else
 	echo "error: $0: Unable to find PXE file $file"
 fi
 
-if egrep -q '^tftp.*/var/lib/tftpboot' /etc/inetd.conf ; then
+if dpkg-query -l atftpd | grep ii ; then
+    if egrep -q '^tftp.*/var/lib/tftpboot' /etc/inetd.conf ; then
 	echo "success: $0: tftp entry in /etc/inetd.conf is using /var/lib/tftpboot"
-else
-	echo "error: $0: tftp entry in /etc/inetd.conf do not use /var/lib/tftpboot"
+    else
+	echo "error: $0: tftp entry in /etc/inetd.conf doesn't use /var/lib/tftpboot"
+    fi
 fi
 
 # verify that tftp server is handing out pxelinux.0 and syslinux/ldlinux.c32
 for file in pxelinux.0 syslinux/ldlinux.c32 ; do
     tmpfile=$(tempfile)
-    if echo get /pxelinux.0 "$tmpfile" | tftp $(hostname) | grep -qi error || \
+    if echo get /var/lib/tftpboot/pxelinux.0 "$tmpfile" | tftp $(hostname) | grep -qi error || \
        [ ! -s "$tmpfile" ] ; then
-        echo "error: $0: tftp server do not provide pxelinux.0!"
+        echo "error: $0: tftp server doesn't provide $file!"
     else
-        echo "success: $0: tftp server provide pxelinux.0."
+        echo "success: $0: tftp server provides $file."
     fi
     ls -l "$tmpfile"
     rm "$tmpfile"

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