Integrate memtest86+ binary

diff --git a/debian/changelog b/debian/changelog
index 254b7ba..7e25bd0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -37,6 +37,8 @@ grml-live (0.9.21) UNRELEASED; urgency=low
     we can improve sanity checks and easify configuration.
   * Support installation of local files (not being part of any Debian package)
     through $CHROOT_INSTALL.
     we can improve sanity checks and easify configuration.
   * Support installation of local files (not being part of any Debian package)
     through $CHROOT_INSTALL.

+  * Integrate memtest86+ binary so we don't ship old versions from
+    the build host. [Closes: issue717]

   * Check whether rebuild of ISO is needed even though the ISO exists already.
     [Closes: issue719]
   * Software related changes:
   * Check whether rebuild of ISO is needed even though the ISO exists already.
     [Closes: issue719]
   * Software related changes:

diff --git a/debian/copyright b/debian/copyright
index 620a828..761ad13 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -54,6 +54,14 @@ License information for the file hdt.c32 shipped as
    of the syslinux source package.
 
 License information for the pci.ids file shipped as
    of the syslinux source package.
 
 License information for the pci.ids file shipped as

+/usr/share/grml-live/templates/boot/addons/memtest
+
+   Downloaded from <http://www.memtest.org/>
+   Upstream Author: Samuel Demeulemeester <memtest@memtest.org>, based on
+   memtest86 by Chris Brady <cbrady@sgi.com>, and various contributors.
+   Licensed unter the GPL v2.
+
+License information for the pci.ids file shipped as

 /usr/share/grml-live/templates/boot/addons/pci.ids
 
    Downloaded from <http://pciids.sourceforge.net/>.
 /usr/share/grml-live/templates/boot/addons/pci.ids
 
    Downloaded from <http://pciids.sourceforge.net/>.

diff --git a/grml-live b/grml-live
index 8a1f44f..adaff85 100755 (executable)
--- a/grml-live
+++ b/grml-live
@@ -571,7 +571,17 @@ if [ "$ARCH" = i386 ] || [ "$ARCH" = amd64 ] ; then
 
       if [ -z "$NO_ADDONS" ] ; then
          [ -d "$BUILD_OUTPUT"/boot/addons   ] || mkdir -p "$BUILD_OUTPUT"/boot/addons
 
       if [ -z "$NO_ADDONS" ] ; then
          [ -d "$BUILD_OUTPUT"/boot/addons   ] || mkdir -p "$BUILD_OUTPUT"/boot/addons

-         cp /boot/memtest86+.bin "$BUILD_OUTPUT"/boot/addons/memtest
+         if [ -r "$TEMPLATE_DIRECTORY"/boot/addons/memtest ] ; then
+            log "Installing $TEMPLATE_DIRECTORY/boot/addons/memtest"
+            cp "$TEMPLATE_DIRECTORY"/boot/addons/memtest "$BUILD_OUTPUT"/boot/addons/memtest
+         elif [ -r /boot/memtest86+.bin ] ; then
+            log "Installing /boot/memtest86+.bin"
+            cp /boot/memtest86+.bin "$BUILD_OUTPUT"/boot/addons/memtest
+         else
+            ewarn "No memtest binary found, skipping."
+            log "No memtest binary found, skipping."
+            eend 0
+         fi

       fi
 
       # if we don't have an initrd we a) can't boot and b) there was an error
       fi
 
       # if we don't have an initrd we a) can't boot and b) there was an error

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