From 0c8232307d6dc37f8d00f06b76431d6f655f53e7 Mon Sep 17 00:00:00 2001
From: Maximilian Gass <mxey@cloudconnected.org>
Date: Thu, 25 Sep 2008 17:07:35 +0200
Subject: Only install memtest in lh_binary_syslinux if enabled.

---
 helpers/lh_binary_syslinux | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'helpers/lh_binary_syslinux')

diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 69a6ceded..1763519ea 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -488,7 +488,11 @@ if [ "binary/${INITFS}" != "${KERNEL_PATH}" ]
 then
 	mv binary/${INITFS}/vmlinuz* ${KERNEL_PATH}
 	mv binary/${INITFS}/initrd* ${KERNEL_PATH}
-	mv binary/${INITFS}/memtest ${KERNEL_PATH}
+
+	if [ "${LH_MEMTEST}" != "disabled" ] && [ "${LH_MEMTEST}" != "none" ]
+	then
+		mv binary/${INITFS}/memtest ${KERNEL_PATH}
+	fi
 fi
 
 # Default entries
-- 
cgit v1.2.3