Use memtest binary from memtest86+ package

diff --git a/debian/control b/debian/control
index ba1897c..31c3845 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Bugs: mailto:bugs@grml.org
 
 Package: grml-live
 Architecture: all
-Depends: ${misc:Depends}, bc, fai-client (>= 3.4.0), fai-server (>= 3.4.0), genisoimage, mksh, moreutils, squashfs-tools (>= 1:4.2-1~grml00), grub-pc-bin, ipxe, pciutils
+Depends: ${misc:Depends}, bc, fai-client (>= 3.4.0), fai-server (>= 3.4.0), genisoimage, mksh, moreutils, squashfs-tools (>= 1:4.2-1~grml00), grub-pc-bin, ipxe, pciutils, memtest86+
 Recommends: grml-live-addons, grml-live-db, ia32-libs
 Suggests: fai-doc
 Description: build system for creating a Grml (based) Linux live system

diff --git a/grml-live b/grml-live
index 55e5ca5..1f255d6 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -716,6 +716,7 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
             # copy addons from Depended packages
             cp -a /usr/lib/ipxe/ipxe.lkrn "${TEMPLATE_DIRECTORY}/boot/addons/"
             cp -a /usr/share/misc/pci.ids "${TEMPLATE_DIRECTORY}/boot/addons/"
+            cp -a /boot/memtest86+.bin "${TEMPLATE_DIRECTORY}/boot/addons/memtest"
 
             # copy only files so we can handle bsd4grml on its own
             for file in ${TEMPLATE_DIRECTORY}/boot/addons/* ; do

diff --git a/templates/boot/addons/memtest b/templates/boot/addons/memtest
deleted file mode 100644 (file)
index e54513b..0000000
Binary files a/templates/boot/addons/memtest and /dev/null differ