[debian-edu-commits] debian-edu/ 01/01: Extend testsuite/pxeinstall to also look for syslinux/ldlinux.c32 on the tftp server, to verify that the syslinux modules are available via tftp.

[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 ec3cd7e23ebe9893019a5067eb65a111c5e3c552
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Tue Sep 16 22:56:02 2014 +0200

    Extend testsuite/pxeinstall to also look for syslinux/ldlinux.c32 on the tftp server, to verify that the syslinux modules are available via tftp.
---
 debian/changelog     |  3 +++
 testsuite/pxeinstall | 22 ++++++++++++----------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5d184a7..57ead7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ debian-edu-config (1.802) UNRELEASED; urgency=medium
   * Call 'apt-get autoremove -y' at the end of setup-roaming, to remove
     the packages we no longer need.
   * Fix fatal typo in setup-roaming trying to chown the wrong file.
+  * Extend testsuite/pxeinstall to also look for syslinux/ldlinux.c32 on
+    the tftp server, to verify that the syslinux modules are available
+    via tftp.
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 15 Sep 2014 10:43:37 +0200
 
diff --git a/testsuite/pxeinstall b/testsuite/pxeinstall
index 3aeba6e..ef1a35d 100755
--- a/testsuite/pxeinstall
+++ b/testsuite/pxeinstall
@@ -26,13 +26,15 @@ else
 	echo "error: $0: tftp entry in /etc/inetd.conf do not use /var/lib/tftpboot"
 fi
 
-# verify that tftp server is handing out pxelinux.0
-tmpfile=$(tempfile)
-if echo get /pxelinux.0 "$tmpfile" | tftp $(hostname) | grep -qi error || \
-   [ ! -s "$tmpfile" ] ; then
-    echo "error: $0: tftp server do not provide pxelinux.0!"
-else
-    echo "success: $0: tftp server provide pxelinux.0."
-fi
-ls -l "$tmpfile"
-rm "$tmpfile"
+# 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 || \
+       [ ! -s "$tmpfile" ] ; then
+        echo "error: $0: tftp server do not provide pxelinux.0!"
+    else
+        echo "success: $0: tftp server provide pxelinux.0."
+    fi
+    ls -l "$tmpfile"
+    rm "$tmpfile"
+done

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