summaryrefslogtreecommitdiff
path: root/helpers
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-05-21 07:31:16 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:09 +0100
commit8424ad261b3a6afb79b2e1e7a375733ceadd83b0 (patch)
tree883696e3d9ae6fb5d71cfc78d96849dec1b83dbb /helpers
parentcaf4ec860a4a36dd2006338a9705b5144ebfa740 (diff)
downloadlive-build-8424ad261b3a6afb79b2e1e7a375733ceadd83b0.zip
live-build-8424ad261b3a6afb79b2e1e7a375733ceadd83b0.tar.gz
Adding option for custom isohybrid arguments.
Diffstat (limited to 'helpers')
-rwxr-xr-xhelpers/binary_iso2
-rwxr-xr-xhelpers/config9
2 files changed, 9 insertions, 2 deletions
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