summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-12-13 21:21:59 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:03 +0100
commit09c2e7943c44cd56cda443b9c59cf9e475e257b0 (patch)
tree00f814e9b5709e1a5e4940a7e84672268e89fc3d
parent701b5affd403d9a25df311fc422dd33eb4526c34 (diff)
downloadlive-build-09c2e7943c44cd56cda443b9c59cf9e475e257b0.zip
live-build-09c2e7943c44cd56cda443b9c59cf9e475e257b0.tar.gz
Adding experimental support for isohybrid (Closes: #558688).
-rwxr-xr-xfunctions/defaults.sh1
-rwxr-xr-xhelpers/lh_binary_iso15
2 files changed, 16 insertions, 0 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 7275293..6be994b 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -677,6 +677,7 @@ Set_defaults ()
# Setting image type
LH_BINARY_IMAGES="${LH_BINARY_IMAGES:-iso}"
+ LH_BINARY_ISO_HYRBID="${LH_BINARY_ISO_HYBRID:-false}"
# Setting apt indices
if echo ${LH_PACKAGES_LISTS} | grep -qs -E "(stripped|minimal)\b"
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index 47529d6..4012a70 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -45,6 +45,11 @@ Create_lockfile .lock
# Checking depends
Check_package chroot/usr/bin/genisoimage genisoimage
+if [ "${LH_BINARY_ISO_HYBRID}" = "true" ]
+then
+ Check_package chroot/usr/bin/isohybrid syslinux-common
+fi
+
# Restoring cache
Restore_cache cache/packages_binary
@@ -175,6 +180,16 @@ cat >> binary.sh << EOF
genisoimage ${GENISOIMAGE_OPTIONS} -o binary.iso binary
EOF
+if [ "${LH_BINARY_ISO_HYRBID}" = "true" ]
+then
+
+cat >> binary.sh << EOF
+
+isohybrid binary.iso
+EOF
+
+fi
+
case "${LH_CHROOT_BUILD}" in
true)
# Moving image