diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:05:13 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:22:25 +0100 |
| commit | cd5110f6b8eb77519d704972276cfd5be6bff055 (patch) | |
| tree | 3bc1bcdbff4ec3bd5a82ae34d9efed47b157e3e0 /helpers/lh_binary_linux-image | |
| parent | fdef63e60c2e68226da2fe92d6cc393c1af2b801 (diff) | |
| download | vyos-live-build-cd5110f6b8eb77519d704972276cfd5be6bff055.tar.gz vyos-live-build-cd5110f6b8eb77519d704972276cfd5be6bff055.zip | |
Adding live-helper 1.0~a17-1.
Diffstat (limited to 'helpers/lh_binary_linux-image')
| -rwxr-xr-x | helpers/lh_binary_linux-image | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/helpers/lh_binary_linux-image b/helpers/lh_binary_linux-image index c6bb3f825..153e476e3 100755 --- a/helpers/lh_binary_linux-image +++ b/helpers/lh_binary_linux-image @@ -52,7 +52,15 @@ rm -f chroot/boot/initrd*bak* # Setting destination directory case "${LIVE_BINARY_IMAGES}" in iso) - DESTDIR="binary/live" + case "${LH_INITRAMFS}" in + casper) + DESTDIR="binary/casper" + ;; + + live-initramfs) + DESTDIR="binary/live" + ;; + esac ;; net) @@ -70,6 +78,20 @@ case "${LIVE_BINARY_IMAGES}" in ;; esac +case "${LIVE_ARCHITECTURE}" in + amd64) + LINUX="vmlinuz" + ;; + + i386) + LINUX="vmlinuz" + ;; + + powerpc) + LINUX="vmlinux" + ;; +esac + # Temporary check for broken syslinux if [ "${LIVE_BINARY_IMAGES}" = "iso" ] then @@ -79,17 +101,14 @@ then case "${LIVE_ARCHITECTURE}" in amd64) DESTDIR="${DESTDIR}.amd" - LINUX="vmlinuz" ;; i386) DESTDIR="${DESTDIR}.386" - LINUX="vmlinuz" ;; powerpc) DESTDIR="${DESTDIR}.ppc" - LINUX="vmlinux" ;; esac fi |