summaryrefslogtreecommitdiff
path: root/helpers/lh_binary_iso
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:05:09 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:18:29 +0100
commit97c3a13dcc9becf93cb7c2aa89ea3e00f06b9179 (patch)
treed7facbbbf53b1a5bc0fa92f671f5b1e29a7e3200 /helpers/lh_binary_iso
parent7c68e6ebca01f64501453fa53941ac77b9c2c335 (diff)
downloadlive-build-97c3a13dcc9becf93cb7c2aa89ea3e00f06b9179.zip
live-build-97c3a13dcc9becf93cb7c2aa89ea3e00f06b9179.tar.gz
Adding live-helper 1.0~a10-1.
Diffstat (limited to 'helpers/lh_binary_iso')
-rwxr-xr-xhelpers/lh_binary_iso36
1 files changed, 27 insertions, 9 deletions
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index a949ff6..2f9fc2e 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -32,7 +32,7 @@ Read_conffile config/binary
Read_conffile config/source
Set_defaults
-for IMAGE in ${LIVE_BINARY_IMAGE}
+for IMAGE in ${LIVE_BINARY_IMAGES}
do
if [ "${IMAGE}" = "iso" ]
then
@@ -75,23 +75,41 @@ do
then
case "${LIVE_BOOTLOADER}" in
grub)
- Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -cache-inodes -b boot/grub/stage2_eltorito -m boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table binary"
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b boot/grub/stage2_eltorito"
+
+ if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
+ then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m boot/grub/stage2_eltorito"
+ fi
;;
syslinux)
- #Chroot "${LH_GENISOIMAGE} -A \"Debian Live\" -p \"Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org\" -publisher \"Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org\" -o binary.iso -r -J -l -V \"${LIVE_ISO_VOLUME}\" -cache-inodes -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary"
- Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -cache-inodes -b isolinux/isolinux.bin -m isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary"
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b isolinux/isolinux.bin -c isolinux/boot.cat"
+
+ if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
+ then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m isolinux/isolinux.bin"
+ fi
+ ;;
+
+ *)
+ Echo_warning "Bootloader on your architecture not yet supported (Continuing in 5 seconds)."
+ sleep 5
;;
esac
- else
- Echo_warning "Bootloader on your architecture not yet supported (Continuing in 5 seconds)."
- sleep 5
- #Chroot "${LH_GENISOIMAGE} -A 'Debian Live' -p 'Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org' -publisher 'Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org' -o binary.iso -r -J -l -V \"${LIVE_ISO_VOLUME}\" binary"
- Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE} -o binary.iso -r -J -l binary -cache-inodes"
+
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
fi
+cat >> chroot/binary.sh << EOF
+${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -A "Debian Live" -p "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -publisher "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -V "${LIVE_ISO_VOLUME}" -o binary.iso -r -J -l -cache-inodes binary
+EOF
+
+ Chroot "sh binary.sh"
+
# Move image
mv chroot/binary chroot/binary.iso ./
+ rm -f chroot/binary.sh
# Removing depends
Remove_package