diff options
| author | Daniel Baumann <daniel@debian.org> | 2007-09-23 10:04:48 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 18:18:28 +0100 |
| commit | 799d4bfb31c279b72088c8ee8a16c2710ab8a309 (patch) | |
| tree | 4bbc1758ceaa46c5e81fe9d66ccdaacfec047ef8 /helpers/lh_binary_linuximage | |
| parent | 677415f6d7efc1e5b888570d70af311d2900c69c (diff) | |
| download | live-build-799d4bfb31c279b72088c8ee8a16c2710ab8a309.zip live-build-799d4bfb31c279b72088c8ee8a16c2710ab8a309.tar.gz | |
Adding live-helper 1.0~a3-1.
Diffstat (limited to 'helpers/lh_binary_linuximage')
| -rwxr-xr-x | helpers/lh_binary_linuximage | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/helpers/lh_binary_linuximage b/helpers/lh_binary_linuximage index 7a9576d..680b4c9 100755 --- a/helpers/lh_binary_linuximage +++ b/helpers/lh_binary_linuximage @@ -1,6 +1,11 @@ #!/bin/sh # lh_binary_linuximage(1) - install linux-image into binary +# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org> +# +# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. +# This is free software, and you are welcome to redistribute it +# under certain conditions; see COPYING for details. set -e @@ -10,6 +15,13 @@ do . ${FUNCTION} done +# Set static variables +DESCRIPTION="install linux-image into binary" +HELP="" +USAGE="${PROGRAM} [--force]" + +Arguments "${@}" + # Reading configuration files Read_conffile config/common Read_conffile config/image @@ -33,7 +45,7 @@ rm -f chroot/boot/initrd*bak* # Setting destination directory case "${LIVE_BINARY_IMAGE}" in iso) - DESTDIR="binary/isolinux" + DESTDIR="binary/live" ;; net) @@ -45,6 +57,16 @@ case "${LIVE_BINARY_IMAGE}" in ;; esac +# Temporary check for broken syslinux +if [ "${LIVE_BINARY_IMAGE}" = "iso" ] +then + case "${LIVE_ARCHITECTURE}" in + i386) + DESTDIR="${DESTDIR}.386" + ;; + esac +fi + # Creating directory if [ ! -d "${DESTDIR}" ] then @@ -52,8 +74,8 @@ then fi # Installing linux-image -cp chroot/boot/vmlinuz* "${DESTDIR}"/vmlinuz -cp chroot/boot/initrd.img* "${DESTDIR}"/initrd.gz +cp chroot/boot/vmlinuz* "${DESTDIR}" +cp chroot/boot/initrd.img* "${DESTDIR}" # Creating stage file Create_stagefile .stage/binary_linuximage |