1 files changed, 52 insertions, 24 deletions
diff --git a/helpers/lh_binary b/helpers/lh_binary
index cc392f5..7641871 100755
--- a/helpers/lh_binary
+++ b/helpers/lh_binary
@@ -1,36 +1,64 @@
 #!/bin/sh
 
-# lh_image(1) - building the images
+# lh_binary(1) - build binary images
+# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
 
-# Building root filesystem
-lh_binary_rootfs
-lh_binary_manifest
-lh_binary_encryption
+set -e
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+	. ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="build binary images"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+if [ "${FORCE}" = "true" ]
+then
+	OPTIONS="${OPTIONS} --force"
+fi
+
+# Preparing root filesystem
+lh_binary_chroot "${OPTIONS}"
 
 # Configuring chroot
-lh_chroot_proc install
-lh_chroot_sysfs install
-lh_chroot_hosts install
-lh_chroot_resolv install
-lh_chroot_sources install
+lh_chroot_proc install "${OPTIONS}"
+lh_chroot_sysfs install "${OPTIONS}"
+lh_chroot_hosts install "${OPTIONS}"
+lh_chroot_resolv install "${OPTIONS}"
+lh_chroot_sources install "${OPTIONS}"
+
+# Building root filesystem
+lh_binary_rootfs "${OPTIONS}"
+lh_binary_manifest "${OPTIONS}"
+lh_binary_encryption "${OPTIONS}"
 
 # Prepare images
-lh_binary_linuximage
-lh_binary_memtest86
-lh_binary_syslinux
-lh_binary_includes
-lh_binary_localincludes
-lh_binary_md5sum
+lh_binary_linuximage "${OPTIONS}"
+lh_binary_memtest86 "${OPTIONS}"
+lh_binary_syslinux "${OPTIONS}"
+lh_binary_includes "${OPTIONS}"
+lh_binary_localincludes "${OPTIONS}"
+lh_binary_md5sum "${OPTIONS}"
 
 # Building images
-lh_binary_hdd
-lh_binary_iso
-lh_binary_net
-lh_binary_usb
+lh_binary_hdd "${OPTIONS}"
+lh_binary_iso "${OPTIONS}"
+lh_binary_net "${OPTIONS}"
+lh_binary_usb "${OPTIONS}"
 
 # Deconfiguring chroot
 rm -f .stage/chroot_sources
-lh_chroot_resolv remove
-lh_chroot_hosts remove
-lh_chroot_sysfs remove
-lh_chroot_proc remove
+lh_chroot_resolv remove "${OPTIONS}"
+lh_chroot_hosts remove "${OPTIONS}"
+lh_chroot_sysfs remove "${OPTIONS}"
+lh_chroot_proc remove "${OPTIONS}"