summaryrefslogtreecommitdiff
path: root/helpers/lh_binary_iso
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2007-09-23 10:04:51 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 18:18:29 +0100
commit8a4a50fdb6b206fbff62fd3043ed388f25a0ffb1 (patch)
tree621dc56a00a65ab0eb1fd4e7d42ad4e45d718741 /helpers/lh_binary_iso
parent4739146fc6c4de8b16418517bb882312c475195c (diff)
downloadlive-build-8a4a50fdb6b206fbff62fd3043ed388f25a0ffb1.zip
live-build-8a4a50fdb6b206fbff62fd3043ed388f25a0ffb1.tar.gz
Adding live-helper 1.0~a7-1.
Diffstat (limited to 'helpers/lh_binary_iso')
-rwxr-xr-xhelpers/lh_binary_iso47
1 files changed, 14 insertions, 33 deletions
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index 63156aa..b22b3b4 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -49,24 +49,11 @@ do
# Creating lock file
Create_lockfile .lock
- if [ ! -f chroot/usr/bin/"${LH_GENISOIMAGE}" ]
- then
- PACKAGES="${PACKAGES} ${LH_GENISOIMAGE}"
- fi
+ # Checking depends
+ Check_package chroot/usr/bin/"${LH_GENISOIMAGE}" ${LH_GENISOIMAGE}
- if [ -n "${PACKAGES}" ]
- then
- # Installing packages
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get install --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude install --assume-yes ${PACKAGES}"
- ;;
- esac
- fi
+ # Installing depends
+ Install_package
# Remove old iso image
if [ -f binary.iso ]
@@ -74,6 +61,11 @@ do
rm -f binary.iso
fi
+ if [ "${LH_VERBOSE}" = "enabled" ]
+ then
+ GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -i"
+ fi
+
# Moving image
mv binary chroot
@@ -82,37 +74,26 @@ do
then
case "${LIVE_BOOTLOADER}" in
grub)
- Chroot "${LH_GENISOIMAGE} -o binary.iso -r -J -l -b boot/grub/stage2_eltorito -m boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table binary"
+ Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -b boot/grub/stage2_eltorito -m boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table binary"
;;
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}\" -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary"
- Chroot "${LH_GENISOIMAGE} -o binary.iso -r -J -l -b isolinux/isolinux.bin -m 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 -b isolinux/isolinux.bin -m isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table binary"
;;
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} -o binary.iso -r -J -l binary"
+ Chroot "${LH_GENISOIMAGE} ${GENISOIMAGE} -o binary.iso -r -J -l binary"
fi
# Move image
mv chroot/binary chroot/binary.iso ./
- # Removing packages
- if [ -n "${PACKAGES}" ]
- then
- case "${LH_APT}" in
- apt|apt-get)
- Chroot "apt-get remove --purge --yes ${PACKAGES}"
- ;;
-
- aptitude)
- Chroot "aptitude purge --assume-yes ${PACKAGES}"
- ;;
- esac
- fi
+ # Removing depends
+ Remove_package
# Creating stage file
Create_stagefile .stage/binary_iso