summaryrefslogtreecommitdiff
path: root/helpers/lh_binary_memtest
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:05:18 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:22:26 +0100
commit28dac4f4381e67febcf7612059340d51c667fa52 (patch)
tree3e333d0f2f1fbf89a394dfb1c536e0aa3ac231c6 /helpers/lh_binary_memtest
parent0d0de885e32ff67d57bb7def451b62d75b8920ab (diff)
downloadvyos-live-build-28dac4f4381e67febcf7612059340d51c667fa52.tar.gz
vyos-live-build-28dac4f4381e67febcf7612059340d51c667fa52.zip
Adding live-helper 1.0~a23-1.
Diffstat (limited to 'helpers/lh_binary_memtest')
-rwxr-xr-xhelpers/lh_binary_memtest4
1 files changed, 3 insertions, 1 deletions
diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest
index 28621f68a..298528538 100755
--- a/helpers/lh_binary_memtest
+++ b/helpers/lh_binary_memtest
@@ -30,6 +30,7 @@ Read_conffile config/bootstrap
Read_conffile config/chroot
Read_conffile config/binary
Read_conffile config/source
+Read_conffile "${LH_CONFIG}"
Set_defaults
if [ "${LH_MEMTEST}" = "disabled" ]
@@ -60,11 +61,12 @@ fi
if [ "${LH_CHROOT_BUILD}" = "enabled" ]
then
- if [ -f chroot/usr/sbin/grub ] && [ ! -d chroot/boot/grub ]
+ if [ -f chroot/usr/sbin/grub ] && [ ! -f chroot/boot/grub/menu.lst ]
then
GRUB="yes"
mkdir -p chroot/boot/grub
+ touch chroot/boot/grub/menu.lst
fi
fi