summaryrefslogtreecommitdiff
path: root/helpers/lh_binary_linuximage
diff options
context:
space:
mode:
Diffstat (limited to 'helpers/lh_binary_linuximage')
-rwxr-xr-xhelpers/lh_binary_linuximage28
1 files changed, 25 insertions, 3 deletions
diff --git a/helpers/lh_binary_linuximage b/helpers/lh_binary_linuximage
index 7a9576d96..680b4c9c9 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