summaryrefslogtreecommitdiff
path: root/helpers/lh_binary_syslinux
diff options
context:
space:
mode:
authorMaximilian Gass <mxey@cloudconnected.org>2008-09-25 17:07:35 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:03:42 +0100
commit0c8232307d6dc37f8d00f06b76431d6f655f53e7 (patch)
treec3f3af9276cfcf55e1bad1a326e2b6ee146f5ede /helpers/lh_binary_syslinux
parenta5368e634d7f9c4264ed127bc92c32740b084095 (diff)
downloadlive-build-0c8232307d6dc37f8d00f06b76431d6f655f53e7.zip
live-build-0c8232307d6dc37f8d00f06b76431d6f655f53e7.tar.gz
Only install memtest in lh_binary_syslinux if enabled.
Diffstat (limited to 'helpers/lh_binary_syslinux')
-rwxr-xr-xhelpers/lh_binary_syslinux6
1 files changed, 5 insertions, 1 deletions
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 69a6ced..1763519 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