diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:04:52 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:18:29 +0100 |
| commit | bd1a5ddc8203907eb40135303bea5488397ec5d0 (patch) | |
| tree | e1cdc0adec3e4799f5db5ad1a8b34800e28a9439 /helpers/lh_binary_memtest | |
| parent | 8a4a50fdb6b206fbff62fd3043ed388f25a0ffb1 (diff) | |
| download | vyos-live-build-bd1a5ddc8203907eb40135303bea5488397ec5d0.tar.gz vyos-live-build-bd1a5ddc8203907eb40135303bea5488397ec5d0.zip | |
Adding live-helper 1.0~a8-1.
Diffstat (limited to 'helpers/lh_binary_memtest')
| -rwxr-xr-x | helpers/lh_binary_memtest | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest index ea0742276..edf3830ed 100755 --- a/helpers/lh_binary_memtest +++ b/helpers/lh_binary_memtest @@ -25,10 +25,11 @@ Arguments "${@}" Echo_debug "Init ${PROGRAM}" # Reading configuration files +Read_conffile config/common Read_conffile config/bootstrap Read_conffile config/chroot -Read_conffile config/common -Read_conffile config/image +Read_conffile config/binary +Read_conffile config/source Set_defaults if [ "${LIVE_MEMTEST}" = "disabled" ] @@ -80,7 +81,7 @@ case "${LIVE_BINARY_IMAGE}" in DESTDIR="tftpboot" ;; - usb|hdd) + usb-hdd|hdd) DESTDIR="binary" ;; esac @@ -92,6 +93,10 @@ then if [ -n "${MULTIARCH}" ] then case "${LIVE_ARCHITECTURE}" in + amd64) + DESTDIR="${DESTDIR}.amd" + ;; + i386) DESTDIR="${DESTDIR}.386" ;; |