diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:05:12 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:19:41 +0100 |
| commit | 504c05c3a63de0af4fd0e876274afc039c5c0ed1 (patch) | |
| tree | 5a29d0f82735a131c9319b5b825c57b740584d13 /helpers/lh_binary_memtest | |
| parent | 37a5c53ddd2825bf6b0ce521908a63d419683981 (diff) | |
| download | vyos-live-build-504c05c3a63de0af4fd0e876274afc039c5c0ed1.tar.gz vyos-live-build-504c05c3a63de0af4fd0e876274afc039c5c0ed1.zip | |
Adding live-helper 1.0~a15-1.
Diffstat (limited to 'helpers/lh_binary_memtest')
| -rwxr-xr-x | helpers/lh_binary_memtest | 13 |
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 |