summaryrefslogtreecommitdiff
path: root/helpers/lh_binary_linux-image
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:05:13 +0200
committerDaniel Baumann <daniel@debian.org>2007-09-23 10:05:13 +0200
commitae5c245c5d0b910b9fde27f99668c46f64f9bcc2 (patch)
tree3bc1bcdbff4ec3bd5a82ae34d9efed47b157e3e0 /helpers/lh_binary_linux-image
parentb88a20b5ddd2c64c9b1f072905dce8eb9e09fc0d (diff)
downloadvyos-live-build-ae5c245c5d0b910b9fde27f99668c46f64f9bcc2.tar.gz
vyos-live-build-ae5c245c5d0b910b9fde27f99668c46f64f9bcc2.zip
Adding live-helper 1.0~a17-1.
Diffstat (limited to 'helpers/lh_binary_linux-image')
-rwxr-xr-xhelpers/lh_binary_linux-image27
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