From b593f32c14e4fb001e69be3910197adec16341ad Mon Sep 17 00:00:00 2001
From: Christian Neukirchen <chneukirchen@gmail.com>
Date: Tue, 4 Nov 2014 18:35:46 +0100
Subject: add memtest86+

---
 isolinux/isolinux.cfg.in | 3 +++
 mklive.sh.in             | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/isolinux/isolinux.cfg.in b/isolinux/isolinux.cfg.in
index 598f825..33ea352 100644
--- a/isolinux/isolinux.cfg.in
+++ b/isolinux/isolinux.cfg.in
@@ -28,6 +28,9 @@ LABEL linuxram
 MENU LABEL @@BOOT_TITLE@@ @@KERNVER@@ @@ARCH@@ (load to RAM)
 KERNEL /boot/vmlinuz
 APPEND initrd=/boot/initrd root=live:CDLABEL=VOID_LIVE init=/sbin/init ro rd.luks=0 rd.md=0 rd.dm=0 loglevel=4 vconsole.unicode=1 vconsole.keymap=@@KEYMAP@@ locale.LANG=@@LOCALE@@ @@BOOT_CMDLINE@@ rd.live.ram=1
+LABEL memtest86+
+MENU LABEL memtest86+
+KERNEL /boot/memtest86+
 LABEL c
 MENU LABEL Boot first HD found by BIOS
 COM32 chain.c32
diff --git a/mklive.sh.in b/mklive.sh.in
index 8700075..54da1a1 100644
--- a/mklive.sh.in
+++ b/mklive.sh.in
@@ -29,7 +29,7 @@
 set -E
 trap "echo; error_out $LINENO $?" INT TERM HUP ERR
 
-readonly REQUIRED_PKGS="base-files syslinux grub-x86_64-efi squashfs-tools xorriso"
+readonly REQUIRED_PKGS="base-files syslinux grub-x86_64-efi squashfs-tools xorriso memtest86+"
 readonly PROGNAME=$(basename $0)
 
 info_msg() {
@@ -142,6 +142,7 @@ generate_initramfs() {
 
     mv $VOIDHOSTDIR/boot/initrd $BOOT_DIR
     cp $VOIDHOSTDIR/boot/vmlinuz-$KERNELVERSION $BOOT_DIR/vmlinuz
+    cp $VOIDHOSTDIR/boot/memtest86+ $BOOT_DIR
 }
 
 generate_isolinux_boot() {
-- 
cgit 1.4.1