[SCM] live-helper branch, debian-next, updated. debian/2.0_a12-1-16-g98849fb

[Daniel Baumann]

The following commit has been merged in the debian-next branch:
commit 98849fb09e8de728d87f580c664eb7cce45075bc
Author: Daniel Baumann <daniel at debian.org>
Date:   Fri May 21 07:31:16 2010 +0200

    Adding option for custom isohybrid arguments.

diff --git a/helpers/binary_iso b/helpers/binary_iso
index 0294c07..a7754b2 100755
--- a/helpers/binary_iso
+++ b/helpers/binary_iso
@@ -194,7 +194,7 @@ then
 
 cat >> binary.sh << EOF
 
-isohybrid ${IMAGE}
+isohybrid ${ISOHYBRID_OPTIONS} ${IMAGE}
 EOF
 
 fi
diff --git a/helpers/config b/helpers/config
index b9053d5..63f6ca3 100755
--- a/helpers/config
+++ b/helpers/config
@@ -78,6 +78,7 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
 \t    [--includes PATH]\n\
 \t    [--initramfs auto|live-initramfs|casper]\n\
 \t    [--interactive shell]\n\
+\t    [--isohybrid-options OPTION|\"OPTIONS\"]\n\
 \t    [--iso-application NAME]\n\
 \t    [--iso-preparer NAME]\n\
 \t    [--iso-publisher NAME]\n\
@@ -145,7 +146,7 @@ Local_arguments ()
 		packages:,packages-lists:,tasks:,security:,volatile:,symlinks:,sysvinit:,binary-filesystem:,binary-images:,
 		binary-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,chroot-build:,
 		debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:,debian-installer-gui:,
-		encryption:,grub-splash:,hostname:,iso-application:,iso-preparer:,iso-publisher:,
+		encryption:,grub-splash:,hostname:,isohybrid-options:,iso-application:,iso-preparer:,iso-publisher:,
 		iso-volume:,jffs2-eraseblock:,memtest:,net-root-filesystem:,net-root-mountoptions:,
 		net-root-path:,net-root-server:,net-cow-filesystem:,net-cow-mountoptions:,net-cow-path:,
 		net-cow-server:,net-tarball:,syslinux-splash:,syslinux-timeout:,syslinux-menu:,
@@ -608,6 +609,11 @@ Local_arguments ()
 				shift 2
 				;;
 
+			--isohybrid-options)
+				LH_ISOHYBRID_OPTIONS="${2}"
+				shift 2
+				;;
+
 			--iso-application)
 				LH_ISO_APPLICATION="${2}"
 				shift 2
@@ -955,6 +961,7 @@ _QUIET="${_QUIET}"
 APT_OPTIONS="${APT_OPTIONS}"
 APTITUDE_OPTIONS="${APTITUDE_OPTIONS}"
 GZIP_OPTIONS="${GZIP_OPTIONS}"
+ISOHYBRID_OPTIONS="${ISOHYBRID_OPTIONS}"
 EOF
 
 # Creating lh_bootstrap_* configuration

-- 
live-helper