summaryrefslogtreecommitdiff
path: root/helpers/lh_binary_memtest
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:05:12 +0200
committerDaniel Baumann <daniel@debian.org>2007-09-23 10:05:12 +0200
commitce2db1b609a7e94ecad2cd1289ea8158c55a97fc (patch)
tree5a29d0f82735a131c9319b5b825c57b740584d13 /helpers/lh_binary_memtest
parent12763194d01c4c11df288c36ef544330cf8d9f00 (diff)
downloadvyos-live-build-ce2db1b609a7e94ecad2cd1289ea8158c55a97fc.tar.gz
vyos-live-build-ce2db1b609a7e94ecad2cd1289ea8158c55a97fc.zip
Adding live-helper 1.0~a15-1.
Diffstat (limited to 'helpers/lh_binary_memtest')
-rwxr-xr-xhelpers/lh_binary_memtest13
1 files changed, 4 insertions, 9 deletions
diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest
index 0ab2c4ee4..329f566e6 100755
--- a/helpers/lh_binary_memtest
+++ b/helpers/lh_binary_memtest
@@ -82,17 +82,12 @@ case "${LIVE_BINARY_IMAGES}" in
;;
tar|usb-hdd)
+ DESTDIR="binary/live"
+
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
- if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
+ if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "${LIVE_BOOTLOADER}" = "syslinux" ]
then
- if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
- then
- DESTDIR="binary"
- else
- DESTDIR="binary/live"
- fi
- else
- DESTDIR="binary/live"
+ DESTDIR="binary"
fi
;;
esac