summaryrefslogtreecommitdiff
path: root/helpers/lh_binary_linux-image
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:05:14 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:22:26 +0100
commit0d5ff4ca7596790f853cf637e0fe225cad810a76 (patch)
tree360ca9a49f3d82d589a4b49c98e5210dfcb3b74e /helpers/lh_binary_linux-image
parentcd5110f6b8eb77519d704972276cfd5be6bff055 (diff)
downloadvyos-live-build-0d5ff4ca7596790f853cf637e0fe225cad810a76.tar.gz
vyos-live-build-0d5ff4ca7596790f853cf637e0fe225cad810a76.zip
Adding live-helper 1.0~a18-1.
Diffstat (limited to 'helpers/lh_binary_linux-image')
-rwxr-xr-xhelpers/lh_binary_linux-image29
1 files changed, 3 insertions, 26 deletions
diff --git a/helpers/lh_binary_linux-image b/helpers/lh_binary_linux-image
index 153e476e3..b4cee2eb6 100755
--- a/helpers/lh_binary_linux-image
+++ b/helpers/lh_binary_linux-image
@@ -46,9 +46,6 @@ Check_lockfile .lock
# Creating lock file
Create_lockfile .lock
-# Removing initrd backup files
-rm -f chroot/boot/initrd*bak*
-
# Setting destination directory
case "${LIVE_BINARY_IMAGES}" in
iso)
@@ -92,34 +89,14 @@ case "${LIVE_ARCHITECTURE}" in
;;
esac
-# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-then
- # Assemble multi-arch
- if [ -n "${MULTIARCH}" ]
- then
- case "${LIVE_ARCHITECTURE}" in
- amd64)
- DESTDIR="${DESTDIR}.amd"
- ;;
-
- i386)
- DESTDIR="${DESTDIR}.386"
- ;;
-
- powerpc)
- DESTDIR="${DESTDIR}.ppc"
- ;;
- esac
- fi
-fi
+Check_multiarchitecture
# Creating directory
mkdir -p "${DESTDIR}"
# Installing linux-image
-cp chroot/boot/"${LINUX}"* "${DESTDIR}"
-cp chroot/boot/initrd.img* "${DESTDIR}"
+cp chroot/boot/"${LINUX}"-* "${DESTDIR}"
+cp chroot/boot/initrd.img-* "${DESTDIR}"
# Creating stage file
Create_stagefile .stage/binary_linux-image