summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2012-12-30 12:58:31 +0100
committerDaniel Baumann <daniel@debian.org>2012-12-30 12:58:38 +0100
commit1c5b4985dc3d78f6863b3272c8c0d39bc25c3f2b (patch)
treed33669c18b0690f260264ffe1432b7ab1b656c86
parent6d81ec003d81030d2911eb09f1c734dcc5dea972 (diff)
downloadvyos-live-build-1c5b4985dc3d78f6863b3272c8c0d39bc25c3f2b.tar.gz
vyos-live-build-1c5b4985dc3d78f6863b3272c8c0d39bc25c3f2b.zip
Omitting memtest in binary if chroot filesystem is set to none.
-rwxr-xr-xscripts/build/binary_memtest2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/build/binary_memtest b/scripts/build/binary_memtest
index 5d21b2201..0bb346eff 100755
--- a/scripts/build/binary_memtest
+++ b/scripts/build/binary_memtest
@@ -24,7 +24,7 @@ Arguments "${@}"
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
Set_defaults
-if [ "${LB_MEMTEST}" = "false" ] || [ "${LB_MEMTEST}" = "none" ]
+if [ "${LB_MEMTEST}" = "false" ] || [ "${LB_MEMTEST}" = "none" ] || [ "${LB_CHROOT_FILESYSTEM}" = "none" ]
then
exit 0
fi