[SCM] live-helper branch, debian, updated. debian/2.0_a2-1-8-gb15948b

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit b15948b8e4c90cc0e1701c675d05bda3352ca00e
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Dec 13 21:21:59 2009 +0100

    Adding experimental support for isohybrid (Closes: #558688).

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

-- 
live-helper