[SCM] live-build branch, upstream, updated. upstream/2.0_a19-1-gbf99a18

Daniel Baumann daniel at debian.org
Sat Jul 24 15:31:04 UTC 2010


The following commit has been merged in the upstream branch:
commit bf99a183605c50ee3dc8c443fb779847aefca71c
Author: Daniel Baumann <daniel at debian.org>
Date:   Sat Jul 24 17:30:12 2010 +0200

    Adding upstream version 2.0~a20.

diff --git a/Makefile b/Makefile
index 87bd3cb..28ff8b4 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SHELL := sh -e
 
 LANGUAGES = de
 
-SCRIPTS = live-helper.sh cgi/* functions/* examples/*/*.sh helpers/* hooks/*
+SCRIPTS = cgi/* functions/* examples/*/*.sh scripts/*.sh scripts/*/*
 
 all: test build
 
@@ -41,11 +41,11 @@ build:
 install:
 	# Installing shared data
 	mkdir -p $(DESTDIR)/usr/share/live-helper
-	cp -r cgi data examples live-helper.sh functions helpers hooks includes lists repositories templates $(DESTDIR)/usr/share/live-helper
+	cp -r cgi data examples functions scripts hooks includes lists repositories templates $(DESTDIR)/usr/share/live-helper
 
 	# Installing executables
 	mkdir -p $(DESTDIR)/usr/bin
-	mv $(DESTDIR)/usr/share/live-helper/helpers/lh $(DESTDIR)/usr/share/live-helper/helpers/live-helper $(DESTDIR)/usr/bin
+	mv $(DESTDIR)/usr/share/live-helper/scripts/build/lh $(DESTDIR)/usr/share/live-helper/scripts/build/live-helper $(DESTDIR)/usr/bin
 
 	# Installing documentation
 	mkdir -p $(DESTDIR)/usr/share/doc/live-helper
diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000..86d1ae2
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+2.0~a20
diff --git a/examples/cron/images.sh b/examples/cron/images.sh
index bdc1483..1361775 100755
--- a/examples/cron/images.sh
+++ b/examples/cron/images.sh
@@ -142,12 +142,6 @@ do
 			--packages-lists ${FLAVOUR} \
 			--tasksel ${TASKSEL} ${KERNEL}
 
-		# TEMPORARY HACK until memtest86+ maintainers fixes his package
-		if [ ${DISTRIBUTION} = "squeeze" ] && [ ${FLAVOUR} = rescue ]
-		then
-			lh config --memtest none
-		fi
-
 		lh build 2>&1 | tee debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso.log
 
 		mv binary*.iso debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${FLAVOUR}.iso
diff --git a/examples/hooks/all_chroot_losetup-lukshome.sh b/examples/hooks/all_chroot_losetup-lukshome.sh
index 5542438..03efd65 100755
--- a/examples/hooks/all_chroot_losetup-lukshome.sh
+++ b/examples/hooks/all_chroot_losetup-lukshome.sh
@@ -52,18 +52,28 @@
 # create-lukshome-file.sh script.
 #
 # Reboot and now use the "lukshome" boot option to mount the encrypted /home,
-# like in using "persistent" boot option with a home-rw file in some partition.
+# like when using "persistent" boot option with a home-rw file in some partition.
 #
 
 
-echo "I: to see how use lukshome hook run create-lukshome-file.sh as root."
+# install needed packages (in case apt recommends are off)
+# make sure that cryptsetup is installed
+echo "I: checking for cryptsetup."
+if [ ! -x /sbin/cryptsetup ]
+then
+	echo "I: installing cryptsetup."
+	DEBIAN_FRONTEND="dialog" apt-get install --yes --force-yes -y cryptsetup
+fi
+
+
+echo "I: to see how to use lukshome hook run create-lukshome-file.sh as root."
 echo "I: creating script /usr/local/sbin/create-lukshome-file.sh"
 cat > /usr/local/sbin/create-lukshome-file.sh << 'EOF'
 #!/bin/sh
 
-# This script is to create an encrypted filesystem in a file to
+# This script will create an encrypted filesystem in a file to
 # be used as /home in a live system built with Debian Live Helper with
-# the lukshome hook in config/chroot_local-hooks/.
+# this hook in config/chroot_local-hooks/.
 #
 # The lukshome boot option will do the following:
 #	- search for a partition with label 'lukshome'
@@ -109,6 +119,19 @@ cat > /usr/local/sbin/create-lukshome-file.sh << 'EOF'
 # Reboot and use the "lukshome" boot option to mount the encrypted /home,
 # like in using "persistent" boot option with a home-rw file in some partition.
 #
+# To use another partition label use the following boot options:
+#	lukshome lukspart=partition_label
+#
+# If you want to use another filename instead of luks-home.img, rename (mv)
+# the file and use the following boot options:
+#	lukshome luksfile=filename
+#
+# Both boot options can be used at the same time, but always with lukshome:
+#	lukshome lukspart=partition_label luksfile=filename
+#
+# By default, if just the lukshome boot option is used, the script will
+# search for a partition labeled 'lukshome' and a file named 'luks-home.img'.
+#
 # Press Shift-PgUp/Shift-PgDn to scrool the instructions on the screen.
 
 
@@ -144,7 +167,7 @@ fi
 # show instructions
 echo ""
 echo "** Instructions to use create-lukshome-file.sh (this script):"
-sed -n '2,51p' /usr/local/sbin/create-lukshome-file.sh | sed 's/^.//'
+sed -n '2,64p' /usr/local/sbin/create-lukshome-file.sh | sed 's/^.//'
 echo ""
 
 
@@ -171,13 +194,13 @@ read FILE_SIZE
 echo ""
 echo "** Creating file luks-home.img."
 echo "** Filling file image with /dev/urandom output. It will take some time."
-echo "(Edit this script to use /dev/random. It's know to more secure but "
+echo "(Edit this script to use /dev/random. It's known to be more secure but "
 echo "it will take a *very* long time to complete."
 dd if=/dev/urandom of=luks-home.img bs=1M count=${FILE_SIZE}
 # To use /dev/random comment the line above and uncomment the next line
 #dd if=/dev/random of=luks-home.img ibs=128 obs=128 count=$((8192*${FILE_SIZE}))
 # You might have to increase kernel entropy by moving the mouse, typing keyboard,
-# make the computer read disk or use network connections.
+# make the computer read the disk or use network connections.
 echo "** Done."
 echo ""
 
@@ -287,16 +310,39 @@ cat > /usr/local/sbin/lukshome.sh << 'EOF'
 # functions taken from live-helpers
 . /usr/share/initramfs-tools/scripts/live-helpers
 
-# search for a partition labeled "lukshome"
+# set default values
+LUKSPART="lukshome"
+LUKSFILE="luks-home.img"
+
+# get boot option lukshome - adapted from live-helpers
+for ARGUMENT in $(cat /proc/cmdline)
+do
+	case "${ARGUMENT}" in
+		lukshome)
+			LUKSHOME=1
+			;;
+		luksfile=*)
+			LUKSFILE="${ARGUMENT#luksfile=}"
+			LUKSHOME=1
+			;;
+		lukspart=*)
+			LUKSPART="${ARGUMENT#lukspart=}"
+			LUKSHOME=1
+			;;
+
+	esac
+done
+
+# search for a partition labeled "lukshome" or $LUKSPART
 for sysblock in $(echo /sys/block/* | tr ' ' '\n' | grep -v loop | grep -v ram | grep -v fd)
 do
 	for dev in $(subdevices "${sysblock}")
 	do
 		devname=$(sys2dev "${dev}")
 		# find partition name and filesystem type
-		if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "lukshome" ]
+		if [ "$(/lib/udev/vol_id -l ${devname} 2>/dev/null)" = "${LUKSPART}" ]
 		then
-			# found one partition named "lukshome"
+			# found one partition with correct label
 			CRYPTHOME="${devname}"
 			# don't search further
 			break
@@ -312,7 +358,7 @@ done
 # if no partition found, exit
 if [ -z "${CRYPTHOME}" ]
 then
-	echo "Could not find any partition with lukshome label. "
+	echo "Could not find any partition with ${LUKSPART} label. "
 	echo "Proceeding with no encrypted /home."
 	exit 0
 fi
@@ -324,11 +370,11 @@ mount -t $(get_fstype "${CRYPTHOME}") "${CRYPTHOME}" /luks-home
 
 # mount losetup encrypted file
 FREE_LOOP="$(/sbin/losetup -f)"
-echo "Opening /luks-home/luks-home.img in ${FREE_LOOP}."
+echo "Opening file /luks-home/${LUKSFILE} in ${FREE_LOOP}."
 
-if [ -f /luks-home/luks-home.img ]
+if [ -f /luks-home/"${LUKSFILE}" ]
 then
-	/sbin/losetup ${FREE_LOOP} /luks-home/luks-home.img
+	/sbin/losetup ${FREE_LOOP} /luks-home/"${LUKSFILE}"
 
 	echo "Adding ${FREE_LOOP} home to /etc/crypttab and setting it as /home in /etc/fstab."
 
@@ -338,8 +384,9 @@ then
 	# update fstab
 	echo "/dev/mapper/home	/home	ext2	defaults,noatime	0	0" >> /etc/fstab
 else
-	echo "Did not found any luks-home.img file in ${CRYPTHOME}!"
+	echo "Did not found any file named ${LUKSFILE} in ${CRYPTHOME}!"
 	echo "Proceeding with no encrypted /home."
+	sleep 2
 	umount -r /luks-home
 	exit 0
 fi
@@ -403,6 +450,15 @@ do
 		lukshome)
 			LUKSHOME=1
 			;;
+		luksfile=*)
+			LUKSFILE="${ARGUMENT#luksfile=}"
+			LUKSHOME=1
+			;;
+		lukspart=*)
+			LUKSPART="${ARGUMENT#lukspart=}"
+			LUKSHOME=1
+			;;
+
 	esac
 done
 
@@ -436,9 +492,8 @@ umount /root/sys
 umount /root/proc
 umount /root/dev
 
-# delete the lukshome scripts, not needed anymore
+# delete the lukshome.sh script, not needed anymore
 # rm -f /root/usr/local/sbin/lukshome.sh
-# rm -f /root/usr/local/sbin/create-lukshome-file.sh
 
 log_end_msg
 
diff --git a/examples/sources/debian-backports_lenny b/examples/sources/debian-backports_lenny
deleted file mode 100644
index 56cf830..0000000
--- a/examples/sources/debian-backports_lenny
+++ /dev/null
@@ -1,9 +0,0 @@
-## This is a sources.list for live-helper(7) to use packages from the
-## Debian Lenny backports repository.
-##
-## To enable it, copy this file to your config/chroot_sources directory, once
-## as e.g. debian-backports.chroot and once as debian-backports.binary.
-
-# Debian backports for Lenny
-deb http://www.backports.org/debian/ lenny-backports main
-deb-src http://www.backports.org/debian/ lenny-backports main
diff --git a/examples/sources/debian-backports_lenny.gpg b/examples/sources/debian-backports_lenny.gpg
deleted file mode 100644
index 8159155..0000000
--- a/examples/sources/debian-backports_lenny.gpg
+++ /dev/null
@@ -1,33 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-mQGiBEMIgw4RBADueqAzlq+rQT9JYSSWnNzo6C+9crI8lzW/fcl2Q3PO97MOQTOx
-Qsf/lOh0Ku7O+VdBa+BwVPuUkSw6wTY5Ku1y/6r1BQzJ9oHkryDDJXsHzKhpdyFc
-/lD4hNGqRkiNg5ulwAI0O1eqffPWDmeR9ZzSsqM40f1U4TNLfPAu1viWxwCgnbWz
-onY6RqSYlRsDQaPsNTwieVEEAJeX2FGgNepD1SvfEremAkWCrYYlSZI76iTIf6bd
-kGkWqIT0vJyE2MNenhDJ2ebbHJVFmL9x8S3m1daC4Zwnacm7aoCY/QgMJ+Js1Fex
-Acev48W9KHgpVbFMd1t8KAwRbmFcQf0C/FZUbE7xScpTxS4z3SsMOuRyfnGpDOi6
-m/SnA/9wpquf3pPwbPykzKWNJEDouiJgt0zaFLauKDPeyTWeJ6htaAPDglArewdq
-bJ9M8QgLFtzjhg/fBQlRRUk7YP4OYtp1OdPkg2D/1rPQNySWlDf21T3N/K8ydKhR
-bYi+AsPuJLQUi3d+lVTFOebaL9felePvDC2/Eod7PSD1/rnkZ7Q0QmFja3BvcnRz
-Lm9yZyBBcmNoaXZlIEtleSA8ZnRwLW1hc3RlckBiYWNrcG9ydHMub3JnPohGBBAR
-AgAGBQJDgImkAAoJEHFe1qB+e4rJ2x4An2oI4xJpDvOx8uDIo9ihG1M0MpUqAJ9S
-cqVUmiyYSPtu8MwcZecy9kmOIYheBBMRAgAeBQJDCIMOAhsDBgsJCAcDAgMVAgMD
-FgIBAh4BAheAAAoJEOqOiyEWuhNsDt4AniaEBvlr4oVFMrGgPiye7iE/jv68AJ48
-OkIfwcKJt7N8ImPAboeimFvWgIheBBMRAgAeBQJDCIMOAhsDBgsJCAcDAgMVAgMD
-FgIBAh4BAheAAAoJEOqOiyEWuhNsDt4AnjdB14rGa/rzz1ohwsi1oEnDRYuyAJ44
-Nv8MTPjOaeEZArQ0flg8OXwF37kCDQRDCIMREAgAzXu6DGSDAz4JH+mlthtiQwNZ
-FU8bjWanGT3DL6zubxwc3ZQmRaMOiVuvJUuaJv8fdGRSvp09dP2/x5mzq2rACiEn
-DwZssNSK5sigxgy2W9zeO9bOtg6bhqZLwlsL8Y2xZhyGL3qGeP4zL1QbXZ1QdJuO
-90Xu7GWYS6Wsj+Y6dUsZFYvTZwSiLkEmgFUTxkNue3DQtZ/KNkwoKc+aqU+S7gDN
-StQDvTNtR6IV11KbKcY1iQ0B2bkh4zShWwloIr83V6huAhfH8GA7UW6saRJAof5D
-JWUb+PRmU2TAOOlyZoM4nMH+sFFDPOeG8fbecwlox5BRTMqcCB5ELbQXoVZT+wAD
-BQf/ffI9R53f9USQkhsSak+k82JjRo9hqKAvPwBv3fDhMYqX3XRmwgNeax2y6Ub0
-AQkDhIC6eJILP5hTb2gjpmYYP7YE/7F1h37lUg7dDYeyPQF54mUXPnIg3uQ/V9HB
-TY+ZW8rsVe1KRvPAuVFU77FfCvIFdLSXVi1HSUcGv9Y7Kk4Tkr7vzKshlcIp6zZr
-O0Y3t/+ekBwTTQqEoUylVYkCSt3z6bjpVWbepkL88rbqJnPueTATw9shjbFYaND8
-cXZox9tQmlOIZ6gDeH1YvFf7ObRLxULm7C6hwik6agtXWkNABVXSxM6MB4hcP9QC
-+FEhK6y/7wC3SyNRBuFujDG1aohJBBgRAgAJBQJDCIMRAhsMAAoJEOqOiyEWuhNs
-VVMAoJ1gbL0PHVf7yDwMjO3HuJBErxLdAJ4v9ojJnvJu2yUl4W586soBm+wsLg==
-=fBrI
------END PGP PUBLIC KEY BLOCK-----
diff --git a/examples/sources/debian-live_sid-snapshots b/examples/sources/debian-live_sid-snapshots
deleted file mode 100644
index 86def09..0000000
--- a/examples/sources/debian-live_sid-snapshots
+++ /dev/null
@@ -1,9 +0,0 @@
-## This is a sources.list for live-helper(7) to use packages from the
-## Debian Live Snapshot repository.
-##
-## To enable it, copy this file to your config/chroot_sources directory, once
-## as e.g. live-snapshots.chroot and once as live-snapshots.binary.
-
-# Debian Live Snapshots
-deb http://live.debian.net/ sid/snapshots main contrib non-free
-deb-src http://live.debian.net/ sid/snapshots main contrib non-free
diff --git a/examples/sources/debian-live_sid-snapshots.gpg b/examples/sources/debian-live_sid-snapshots.gpg
deleted file mode 100644
index e817812..0000000
--- a/examples/sources/debian-live_sid-snapshots.gpg
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-mQENBEtljiMBCADSIplButAWL0OuM4uvDtZYjBcPlQNjwQDZ/Dpg5QuRAgNSUdx7
-wBQOQXqC4LCi9ykpvYi8FEtz0bl60M9uJdc4n+130It8gSZs7Cn0WoFk7uo0S4IS
-79EQdP+yfZNv/vY11cv6TwOb7JEqB5BI7T642Y+UgQZnpT/Diykks986CYeZSfpm
-6gnASAEe0jJg79Zpzpc3kBECCwN6fIFZ4MOxkaXgvfhWsOS42s6zxtQXJ65njibR
-W47Klu75sxPS+5EKaS10C5+Tmv0XpV7S7s8VtRtKemMjYfLdsPmubmGcI+t/uEF7
-qT2zJLINSIIL01kpVBFpqxCmnO51XURgRqOFABEBAAG0Z2RlYmlhbi1tYWludGFp
-bmVycy5vcmcgQXJjaGl2ZSBBdXRvbWF0aWMgU2lnbmluZyBLZXkgKDIwMTAwMTAx
-KSA8c3lzYWRtaW5AbGlzdHMuZGViaWFuLW1haW50YWluZXJzLm9yZz6JAT4EEwEC
-ACgFAktljiMCGwMFCQHihQAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEJ7r
-yNubnDy2BeUH/1SWIbqzIh2LkF1XK4iXyXGrzGlqtef5JX/tjaY7RC5gPVyZBP1V
-jHcozn7Sum09KxaijsgP/lIVZ2tnu9niT2Waz5GPgUv79bqjGc238gEhH5zpbun/
-WF6UapiINHNYLFx0f18ImQ1gU13hLn0PYvuyN/QKmxaPlcUQtNJc3/ZtyFA0nPpB
-ejiMEBxgw0H80FWSpawLKUFEStT1Y+khK0fZYVoWl0OwhJbsY/L6nBcfv27zH+5d
-g7VuNpRte7AyxZEufescwWILTjIq3K2v9XHAy7sJmstfycrHQFy/33hE4yRQcOyu
-bAMnNqLUp7mwqRw+KYPkAQo/DUlO//SsUKY=
-=+IFy
------END PGP PUBLIC KEY BLOCK-----
diff --git a/functions/common.sh b/functions/common.sh
index e23ee15..5a9aeaa 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -9,7 +9,7 @@
 
 PROGRAM="$(basename ${0})"
 PACKAGE="live-helper"
-VERSION="2.0~a19-1"
+VERSION="2.0~a20-1"
 CONFIG_VERSION="$(echo ${VERSION} | awk -F- '{ print $1 }')"
 
 PATH="${PWD}/auto/helpers:${PATH}"
diff --git a/helpers/binary b/helpers/binary
deleted file mode 100755
index 11a1781..0000000
--- a/helpers/binary
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/sh
-
-# lh_binary(1) - build binary images
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'build binary images')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Setup cleanup function
-Setup_cleanup
-
-# Preparing root filesystem
-lh binary_chroot ${*}
-
-if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
-then
-	# Configuring chroot
-	lh chroot_devpts install ${*}
-	lh chroot_proc install ${*}
-	lh chroot_selinuxfs install ${*}
-	lh chroot_sysfs install ${*}
-	lh chroot_hosts install ${*}
-	lh chroot_resolv install ${*}
-	lh chroot_hostname install ${*}
-	lh chroot_sysv-rc install ${*}
-	lh chroot_upstart install ${*}
-	lh chroot_apt install-binary ${*}
-	lh chroot_sources install ${*}
-fi
-
-# Building root filesystem
-lh binary_rootfs ${*}
-lh binary_manifest ${*}
-lh binary_encryption ${*}
-
-# Prepare images
-lh binary_local-packageslists ${*}
-lh binary_linux-image ${*}
-lh binary_debian-installer ${*}
-lh binary_memtest ${*}
-lh binary_grub ${*}
-lh binary_grub2 ${*}
-lh binary_syslinux ${*}
-lh binary_yaboot ${*}
-lh binary_silo ${*}
-lh binary_disk ${*}
-lh binary_win32-loader ${*}
-lh binary_includes ${*}
-lh binary_local-includes ${*}
-lh binary_local-hooks ${*}
-lh binary_checksums ${*}
-
-if [ "${LH_BUILD_WITH_CHROOT}" != "true" ]
-then
-	lh chroot_devpts install ${*}
-	lh chroot_proc install ${*}
-	lh chroot_selinuxfs install ${*}
-	lh chroot_sysfs install ${*}
-fi
-
-# Building images
-lh binary_iso ${*}
-lh binary_net ${*}
-lh binary_tar ${*}
-lh binary_usb ${*}
-lh binary_virtual-hdd ${*}
-
-if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
-then
-	# Deconfiguring chroot
-	rm -f .stage/chroot_sources
-	lh chroot_hostname remove ${*}
-	lh chroot_resolv remove ${*}
-	lh chroot_hosts remove ${*}
-fi
-
-lh chroot_apt remove ${*}
-lh chroot_sysv-rc remove ${*}
-lh chroot_sysfs remove ${*}
-lh chroot_upstart remove ${*}
-lh chroot_selinuxfs remove ${*}
-lh chroot_proc remove ${*}
-lh chroot_devpts remove ${*}
diff --git a/helpers/binary_checksums b/helpers/binary_checksums
deleted file mode 100755
index dd8d369..0000000
--- a/helpers/binary_checksums
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh
-
-# lh_binary_checksums(1) - create binary checksums
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'create binary checksums')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_CHECKSUMS}" = "none" ] || [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ]
-then
-	exit 0
-fi
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_checksums
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-for CHECKSUM in ${LH_CHECKSUMS}
-do
-	Echo_message "Begin creating binary ${CHECKSUM}sum.txt..."
-
-	# Remove old checksums
-	if [ -f binary/${CHECKSUM}sum.txt ]
-	then
-		rm -f binary/${CHECKSUM}sum.txt
-	fi
-
-	# Calculating checksums
-	cd binary
-	find . -type f \
-		\! -path './isolinux/isolinux.bin' \
-		\! -path './boot/grub/stage2_eltorito' \
-		\! -path './md5sum.txt' \
-		\! -path './sha1sum.txt' \
-		\! -path './sha256sum.txt' \
-	-print0 | sort -z | xargs -0 ${CHECKSUM}sum > ../${CHECKSUM}sum.txt
-
-cat > ${CHECKSUM}sum.txt << EOF
-This file contains the list of ${CHECKSUM} checksums of all files on this medium.
-
-You can verify them automatically with the 'integrity-check' boot parameter,
-or, manually with: '${CHECKSUM}sum -c ${CHECKSUM}sum.txt'.
-
-
-EOF
-
-	cat ../${CHECKSUM}sum.txt >> ${CHECKSUM}sum.txt
-	rm -f ../${CHECKSUM}sum.txt
-
-	cd "${OLDPWD}"
-done
-
-# File list
-cd binary
-find . | sed -e 's|^.||g' | grep "^/" | sort > ../binary.list
-cd "${OLDPWD}"
-
-# Creating stage file
-Create_stagefile .stage/binary_checksums
diff --git a/helpers/binary_chroot b/helpers/binary_chroot
deleted file mode 100755
index 16c4ba3..0000000
--- a/helpers/binary_chroot
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-
-# lh_binary_chroot(1) - copy chroot into chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'copy chroot into chroot')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin copying chroot..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_chroot
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Normally, virtual filesystems are not mounted here, but people tend to be lazy
-if [ -f chroot/proc/version ]
-then
-	if [ "${LH_USE_FAKEROOT}" != "true" ]
-then
-		${LH_ROOT_COMMAND} umount chroot/proc
-	else
-		rm -rf chroot/proc
-		mkdir -p chroot/proc
-	fi
-fi
-
-if [ -d chroot/sys/kernel ]
-then
-	if [ "${LH_USE_FAKEROOT}" != "true" ]
-	then
-		${LH_ROOT_COMMAND} umount chroot/sys
-	else
-		rm -rf chroot/sys
-		mkdir -p chroot/sys
-	fi
-fi
-
-# Copying /dev if using fakeroot
-if [ "${LH_USE_FAKEROOT}" = "true" ]
-then
-	rm -rf chroot/dev
-	find /dev | cpio -dmpu chroot
-fi
-
-if [ "${LH_BUILD_WITH_CHROOT}" = "false" ]
-then
-	exit 0
-fi
-
-if [ "${LH_CACHE}" = "true" ] && Find_files cache/stages_rootfs/filesystem*
-then
-	exit 0
-fi
-
-Echo_message "This may take a while."
-
-# Removing old chroot
-${LH_ROOT_COMMAND} rm -rf chroot/chroot
-${LH_ROOT_COMMAND} rm -rf chroot.tmp
-
-# Copying new chroot
-if [ -d cache/stages_bootstrap ] && [ "${LH_CHROOT_FILESYSTEM}" != "plain" ]
-then
-	${LH_ROOT_COMMAND} mv chroot chroot.tmp
-	${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot
-	${LH_ROOT_COMMAND} touch chroot/chroot.cache
-else
-	${LH_ROOT_COMMAND} cp -a chroot chroot.tmp
-fi
-
-${LH_ROOT_COMMAND} mv chroot.tmp chroot/chroot
-
-# Handling chroot excludes
-if [ -f config/binary_rootfs/excludes ]
-then
-	case "${LH_BUILD_WITH_CHROOT}" in
-		true)
-			cp config/binary_rootfs/excludes chroot/chroot/excludes
-			chroot chroot/chroot /usr/bin/env -i xargs --arg-file=/excludes -I FILE bash -c 'rm -rf FILE'
-			rm -f chroot/chroot/excludes
-			;;
-
-		false)
-			cp config/binary_rootfs/excludes chroot/excludes
-			chroot chroot /usr/bin/env -i xargs --arg-file=/excludes -I FILE bash -c 'rm -rf FILE'
-			rm -f chroot/excludes
-			;;
-	esac
-fi
-
-if [ -n "${LH_ROOT_COMMAND}" ]
-then
-	${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
-fi
-
-# Creating stage file
-Create_stagefile .stage/binary_chroot
diff --git a/helpers/binary_debian-installer b/helpers/binary_debian-installer
deleted file mode 100755
index 32a8278..0000000
--- a/helpers/binary_debian-installer
+++ /dev/null
@@ -1,686 +0,0 @@
-#!/bin/sh
-
-# lh_binary_debian-installer(1) - install debian-installer into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'install debian-installer into binary')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ]
-then
-	exit 0
-fi
-
-if [ "${_DEBUG}" = "true" ]
-then
-	WGET_OPTIONS="${WGET_OPTIONS} --verbose"
-elif [ "${_QUIET}" = "true" ]
-then
-	WGET_OPTIONS="${WGET_OPTIONS} --quiet"
-else
-	WGET_OPTIONS="${WGET_OPTIONS} --no-verbose"
-fi
-
-# Check d-i configuration
-case "${LH_DEBIAN_INSTALLER}" in
-	true|cdrom|netinst|netboot|businesscard|live)
-		;;
-
-	false)
-		exit 0
-		;;
-
-	*)
-		Echo_error "debian-installer flavour %s not supported." "${LH_DEBIAN_INSTALLER}"
-		exit 1
-		;;
-esac
-
-Echo_message "Begin installing debian-installer..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_debian-installer
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Checking depends
-Check_package chroot/usr/bin/wget wget
-Check_package chroot/usr/bin/apt-ftparchive apt-utils
-
-# Restoring cache
-Restore_cache cache/packages_binary
-
-# Installing depends
-Install_package
-
-# Setting destination directory
-case "${LH_BINARY_IMAGES}" in
-	net)
-		DESTDIR="tftpboot/debian-install/${LH_ARCHITECTURE}"
-		;;
-
-	usb*|tar)
-		DESTDIR="binary/install"
-		;;
-
-	*)
-		DESTDIR="binary/install"
-		;;
-esac
-
-# Set d-i image type
-case "${LH_DEBIAN_INSTALLER}" in
-	businesscard|netboot|netinst)
-		DI_IMAGE_TYPE="netboot"
-		;;
-	*)
-		case "${LH_BINARY_IMAGES}" in
-			net)
-				DI_IMAGE_TYPE="netboot"
-				;;
-
-			*)
-				DI_IMAGE_TYPE="cdrom"
-				;;
-		esac
-		;;
-esac
-
-# Set architecture-specific variables
-case "${LH_ARCHITECTURE}" in
-	powerpc)
-		case "${DI_IMAGE_TYPE}" in
-			cdrom)
-				DI_REMOTE_BASE="${LH_ARCHITECTURE}/cdrom"
-			;;
-
-			netboot)
-				DI_REMOTE_BASE="${LH_ARCHITECTURE}/netboot"
-				;;
-		esac
-
-		DI_REMOTE_KERNEL="vmlinux"
-		DI_REMOTE_BASE_GTK="${DI_REMOTE_BASE}/gtk"
-		;;
-
-	sparc)
-		DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
-		DI_REMOTE_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
-		DI_REMOTE_BASE_GTK="none"
-
-		DI_REMOTE_BASE="cdrom"
-		;;
-	*)
-		case "${DI_IMAGE_TYPE}" in
-			netboot)
-				DI_REMOTE_BASE="netboot/debian-installer/${LH_ARCHITECTURE}"
-				DI_REMOTE_BASE_GTK="netboot/gtk/debian-installer/${LH_ARCHITECTURE}"
-				DI_REMOTE_KERNEL="linux"
-				;;
-
-			cdrom)
-				DI_REMOTE_BASE="cdrom"
-				DI_REMOTE_BASE_GTK="cdrom/gtk"
-				DI_REMOTE_KERNEL="vmlinuz"
-				;;
-		esac
-		;;
-esac
-
-Check_multiarchitecture
-
-Install_file() {
-	local FILE
-	FILE="${1}"
-
-	local TARGET
-	TARGET="${2}"
-
-	SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')"
-
-	if [ -z "${SOURCE}" ]
-	then
-		SOURCE="$(basename ${FILE} | awk -F_ '{ print $1 }')"
-	fi
-
-	case "${SOURCE}" in
-		lib?*)
-			LETTER="$(echo ${SOURCE} | sed 's|\(....\).*|\1|')"
-			;;
-
-		*)
-			LETTER="$(echo ${SOURCE} | sed 's|\(.\).*|\1|')"
-			;;
-	esac
-
-	# Install directory
-	mkdir -p "${TARGET}"/"${LETTER}"/"${SOURCE}"
-
-	# Move files
-	cp "${FILE}" "${TARGET}"/"${LETTER}"/"${SOURCE}"
-}
-
-# Set absolute directory for caching; we require it when we call Download_file
-# from a non-standard cwd.
-_LH_CACHE_DIR="$(pwd)/cache/binary_debian-installer"
-
-Download_file () {
-	local _LH_TARGET
-	_LH_TARGET="${1}"
-
-	local _LH_URL
-	_LH_URL="${2}"
-
-	_LH_CACHE_FILE="${_LH_CACHE_DIR}/$(echo "${_LH_URL}" | sed 's|/|_|g')"
-
-	if [ ! -f "${_LH_CACHE_FILE}" ]
-	then
-		mkdir -p ${_LH_CACHE_DIR}
-		if ! wget ${WGET_OPTIONS} -O "${_LH_CACHE_FILE}" "${_LH_URL}"
-		then
-			rm -f "${_LH_CACHE_FILE}"
-
-			Echo_error "Could not download file: %s" "${_LH_URL}"
-			exit 1
-		fi
-	fi
-
-	if [ "$(stat --printf %d "${_LH_CACHE_DIR}")" = "$(stat --printf %d ./)" ]
-	then
-		CP_OPTIONS="-l"
-	fi
-
-	cp -f ${CP_OPTIONS} -- "${_LH_CACHE_FILE}" "${_LH_TARGET}"
-}
-
-VMLINUZ_DI="vmlinuz"
-INITRD_DI="initrd.gz"
-DESTDIR_DI="${DESTDIR}"
-
-VMLINUZ_GI="gtk/vmlinuz"
-INITRD_GI="gtk/initrd.gz"
-DESTDIR_GI="${DESTDIR}/gtk"
-
-if [ "${LH_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ]
-then
-	LH_DEBIAN_INSTALLER_DISTRIBUTION="sid"
-
-	# Debian Installer daily builds
-	case "${LH_ARCHITECTURE}" in
-		alpha|amd64|hppa|ia64|mips|mipsel|powerpc)
-			URL="http://d-i.debian.org/daily-images/${LH_ARCHITECTURE}/daily/"
-			;;
-
-		arm|armel)
-			URL="http://people.debian.org/~kmuto/d-i/images/daily/"
-			;;
-
-		i386)
-			URL="http://people.debian.org/~joeyh/d-i/images/daily/"
-			;;
-
-		m68k)
-			URL="http://people.debian.org/~smarenka/d-i/images-m68k/daily/"
-			;;
-
-		s390)
-			URL="http://lophos.multibuild.org/d-i/images/daily/"
-			;;
-
-		sparc)
-			URL="http://people.debian.org/~stappers/d-i/images/daily/"
-			;;
-
-		*)
-			Echo_error "No daily-builds found for your architecture."
-			exit 1
-			;;
-	esac
-else
-	URL="${LH_MIRROR_DEBIAN_INSTALLER}/dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LH_ARCHITECTURE}/current/images/"
-fi
-
-mkdir -p "${DESTDIR_DI}"
-
-if [ "${LH_ARCHITECTURE}" = "sparc" ] && [ "${DI_IMAGE_TYPE}" = "netboot" ]
-then
-	# There are no prepared kernel/initrd pairs for sparc netboot so we
-	# must unpack them from a mini.iso
-	Download_file mini.iso ${URL}/mini.iso
-
-	mkdir mini.tmp
-	${LH_ROOT_COMMAND} mount -o loop -t iso9660 mini.iso mini.tmp
-
-	cp mini.tmp/boot/vmlinuz-${DEFAULT_FLAVOUR} "${DESTDIR}"/"${VMLINUZ_DI}"
-	cp mini.tmp/boot/initrd.gz "${DESTDIR}"/"${INITRD_DI}"
-
-	${LH_ROOT_COMMAND} umount mini.tmp
-	rm -rf mini.tmp mini.iso
-else
-	# Downloading debian-installer
-	Download_file "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI_REMOTE_BASE}/${DI_REMOTE_KERNEL}
-	Download_file "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI_REMOTE_BASE}/initrd.gz
-
-	# Downloading graphical-installer
-	DOWNLOAD_GTK_INSTALLER=0
-	if [ "${LH_DEBIAN_INSTALLER_GUI}" = "true" ]
-	then
-		case "${LH_ARCHITECTURE}" in
-			amd64|i386)
-				DOWNLOAD_GTK_INSTALLER=1
-				;;
-
-			powerpc)
-				if [ "${LH_DEBIAN_INSTALLER}" = "netboot" ]
-				then
-					DOWNLOAD_GTK_INSTALLER=1
-				fi
-				;;
-		esac
-	fi
-
-	if [ ${DOWNLOAD_GTK_INSTALLER} -eq 1 ]
-	then
-		mkdir -p "${DESTDIR_GI}"
-		Download_file "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/${DI_REMOTE_KERNEL}
-		Download_file "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/initrd.gz
-	fi
-fi
-
-# Only download additional packages if appropriate
-if [ "${DI_IMAGE_TYPE}" != "netboot" ]
-then
-	# Downloading additional packages
-	mkdir -p chroot/binary.deb/archives/partial
-	mkdir -p binary/pool/main
-	mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
-	touch chroot/var/lib/dpkg/status
-
-	case "${LH_ARCHITECTURE}" in
-		amd64)
-			#DI_REQ_PACKAGES="lilo grub grub2"
-			DI_REQ_PACKAGES="lilo grub"
-
-			case "${LH_MODE}" in
-				ubuntu)
-					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-generic"
-					;;
-
-				*)
-					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-amd64"
-					;;
-			esac
-			;;
-
-		i386)
-			#DI_REQ_PACKAGES="elilo lilo grub grub2"
-			DI_REQ_PACKAGES="elilo lilo grub"
-
-			case "${LH_MODE}" in
-				ubuntu)
-					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-generic"
-					;;
-
-				*)
-					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-486 linux-image-2.6-686"
-					;;
-			esac
-			;;
-
-		sparc)
-			DI_REQ_PACKAGES="silo"
-			DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-sparc64 linux-image-2.6-sparc64-smp"
-			;;
-
-		powerpc)
-			DI_REQ_PACKAGES="yaboot"
-			DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-powerpc linux-image-2.6-powerpc64 linux-image-2.6-powerpc-smp"
-			;;
-	esac
-
-	DI_PACKAGES="${DI_PACKAGES} busybox cryptsetup lvm2"
-
-	# Set apt command prefix
-	_LH_APT_COMMAND="apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb -o APT::Install-Recommends=false --download-only"
-
-	if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
-	then
-		# We don't want to duplicate .debs of packages in binary/pool that are already
-		# installed to target/ via live-installer.
-		#
-		# However, we need to force various packages' inclusion in binary/pool/main as
-		# d-i does not support (for example) re-installing grub from target/ - the grub
-		# .debs must actually exist.
-
-		# Modify dpkg status to show the required packages are not installed.
-		cp chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
-		for PACKAGE in ${DI_REQ_PACKAGES}
-		do
-			awk -v f=0 '
-				f == 1 { print "Status: purge ok not-installed"; f=0; next }
-				/Package: '"${PACKAGE}"'/ { f=1; }
-				{ print }
-				' chroot/var/lib/dpkg/status > chroot/var/lib/dpkg/status.awk
-			mv chroot/var/lib/dpkg/status.awk chroot/var/lib/dpkg/status
-		done
-
-		# Download .deb's that we just marked as "purged" which caused broken dependencies
-		Chroot chroot ${_LH_APT_COMMAND} -f dist-upgrade
-
-		# Revert dpkg status file
-		mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
-
-		# Download .debs of the required packages
-		Chroot chroot ${_LH_APT_COMMAND} install ${DI_REQ_PACKAGES}
-	else
-		# Download .debs of the required packages
-		Chroot chroot ${_LH_APT_COMMAND} install ${DI_PACKAGES}
-
-		# Revert dpkg status file
-		mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
-	fi
-
-	mv chroot/binary.deb ./
-
-	if Find_files binary.deb/archives/*.deb
-	then
-		for FILE in binary.deb/archives/*.deb
-		do
-			Install_file "${FILE}" "binary/pool/main"
-		done
-	fi
-
-	if [ "${LH_DEBIAN_INSTALLER}" != "live" ]
-	then
-		# Including base debian packages
-		if ls cache/packages_bootstrap/*.deb > /dev/null 2>&1
-		then
-			for FILE in cache/packages_bootstrap/*.deb
-			do
-				Install_file "${FILE}" "binary/pool/main"
-			done
-		else
-			Echo_error "Could not find packages in cache/packages_bootstrap."
-			Echo_error "You selected values of LH_CACHE, LH_CACHE_PACKAGES, LH_CACHE_STAGES and LH_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being cached - these are required when integrating the Debian Installer."
-			exit 1
-		fi
-	fi
-
-	# Including local debs
-	if Find_files config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb
-	then
-		for FILE in config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb
-		do
-			Install_file "${FILE}" "binary/pool/main"
-		done
-	fi
-
-	if Find_files config/binary_local-debs/*_all.deb
-	then
-		for FILE in config/binary_local-debs/*_all.deb
-		do
-			Install_file "${FILE}" "binary/pool/main"
-		done
-	fi
-
-	# Generating deb indices
-	mkdir -p binary/dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}
-
-	mv binary chroot/root
-	echo "cd /root/binary && apt-ftparchive packages pool/main > dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}/Packages" > chroot/binary.sh
-	Chroot chroot "sh binary.sh"
-	rm -f chroot/binary.sh
-	mv chroot/root/binary ./
-
-	gzip -9 -c binary/dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}/Packages > binary/dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}/Packages.gz
-
-	# Fetching release
-	Download_file binary/dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}/Release "${LH_MIRROR_CHROOT}"/dists/"${LH_DEBIAN_INSTALLER_DISTRIBUTION}"/main/binary-"${LH_ARCHITECTURE}"/Release
-
-	mkdir binary.udeb
-	cd binary.udeb
-
-	# Downloading udeb indices
-	Download_file Packages.gz "${LH_MIRROR_CHROOT}"/dists/"${LH_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LH_ARCHITECTURE}"/Packages.gz
-	gunzip -c Packages.gz > Packages
-
-	# Sorting udebs
-	UDEBS="$(awk '/Filename: / { print $2 }' Packages)"
-
-	# Downloading udebs
-	for UDEB in ${UDEBS}
-	do
-		if [ -f ../cache/packages_debian-installer.udeb/"$(basename ${UDEB})" ]
-		then
-			# Copying cached udebs
-			cp ../cache/packages_debian-installer.udeb/"$(basename ${UDEB})" ./
-		else
-			# Downloading udebs
-			wget ${WGET_OPTIONS} "${LH_MIRROR_CHROOT}"/${UDEB}
-		fi
-	done
-
-	# Caching udebs
-	rm -rf ../cache/packages_debian-installer.udeb
-	mkdir -p ../cache/packages_debian-installer.udeb
-	cp *.udeb ../cache/packages_debian-installer.udeb
-
-	# Including local udebs
-	if Find_files ../config/binary_local-udebs/*_"${LH_ARCHITECTURE}".udeb
-	then
-		for FILE in ../config/binary_local-udebs/*_"${LH_ARCHITECTURE}".udeb
-		do
-			Install_file "${FILE}" "pool/main"
-
-			# Prefer local udebs over downloaded udebs
-			rm -f "$(basename ${FILE} | awk -F_ '{ print $1 }')"_*.udeb
-		done
-	fi
-
-	if Find_files ../config/binary_local-udebs/*_all.udeb
-	then
-		for FILE in ../config/binary_local-udebs/*_all.udeb
-		do
-			Install_file "${FILE}" "pool/main"
-
-			# Prefer local udebs over downloaded udebs
-			rm -f "$(basename ${FILE} | awk -F_ '{ print $1 }')"_*.udeb
-		done
-	fi
-
-	# Excluding udebs
-	grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DEBIAN_INSTALLER_DISTRIBUTION}"/udeb_exclude > exclude || true
-	grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DEBIAN_INSTALLER_DISTRIBUTION}"/exclude-udebs >> exclude || true
-	grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DEBIAN_INSTALLER_DISTRIBUTION}"/exclude-udebs-${LH_ARCHITECTURE} >> exclude || true
-
-	# Local exclude file
-	if [ -e ../config/binary_debian-installer/udeb_exclude ]
-	then
-		cat ../config/binary_debian-installer/udeb_exclude >> exclude
-	fi
-
-	# Excluding udebs from excludes because we want them to be in the image on purpose
-	sed -i -e 's|di-utils-exit-installer||' exclude # used for live-installer-launcher
-
-	while read EXCLUDE
-	do
-		if [ "${LH_DEBIAN_INSTALLER}" = "live" ] && [ "${EXCLUDE}" = "live-installer" ]
-		then
-			continue
-		fi
-
-		rm -f ${EXCLUDE}_*.udeb
-	done < exclude
-
-	# Enable live-installer
-	if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
-	then
-		# Remove local udebs
-		rm -f pool/main/b/base-installer/bootstrap-base_*.udeb
-
-		# Remove d-i udebs
-		rm -f bootstrap-base_*.udeb
-	fi
-
-	# Moving udebs
-	for UDEB in ${UDEBS}
-	do
-		if [ -f "$(basename ${UDEB})" ]
-		then
-			mkdir -p $(dirname ${UDEB})
-			mv "$(basename ${UDEB})" "$(dirname ${UDEB})"
-		fi
-	done
-
-	# Creating udeb indices
-	mkdir -p dists/"${LH_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LH_ARCHITECTURE}"
-	cd "${OLDPWD}"
-
-	mv binary.udeb chroot/root
-	echo "cd /root/binary.udeb && apt-ftparchive packages pool/main > dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LH_ARCHITECTURE}/Packages" > chroot/binary.sh
-	Chroot chroot "sh binary.sh"
-	rm -f chroot/binary.sh
-	mv chroot/root/binary.udeb ./
-
-	cd binary.udeb
-	gzip -9 -c dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LH_ARCHITECTURE}/Packages > dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LH_ARCHITECTURE}/Packages.gz
-
-	rm -f Packages* exclude
-	find . | cpio -dmpu "${OLDPWD}"/binary
-	cd "${OLDPWD}"
-
-	rm -rf binary.udeb
-	rm -rf binary.deb
-
-	# Generating release file
-	mv binary chroot/root
-
-cat > chroot/binary.sh << EOF
-cd /root/binary && apt-ftparchive \
-	-o APT::FTPArchive::Release::Origin="Debian" \
-	-o APT::FTPArchive::Release::Label="Debian" \
-	-o APT::FTPArchive::Release::Suite="${LH_DEBIAN_INSTALLER_DISTRIBUTION}" \
-	-o APT::FTPArchive::Release::Version="4.0" \
-	-o APT::FTPArchive::Release::Codename="${LH_DEBIAN_INSTALLER_DISTRIBUTION}" \
-	-o APT::FTPArchive::Release::Date="$(date -R)" \
-	-o APT::FTPArchive::Release::Architectures="${LH_ARCHITECTURE}" \
-	-o APT::FTPArchive::Release::Components="main" \
-	-o APT::FTPArchive::Release::Description="Last updated: $(date -R)" \
-	release dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION} > dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/Release
-EOF
-
-	Chroot chroot "sh binary.sh"
-	rm -f chroot/binary.sh
-	mv chroot/root/binary ./
-
-	# Creating dist symlinks
-	for DISTRIBUTION in frozen stable testing unstable
-	do
-		ln -s ${LH_DEBIAN_INSTALLER_DISTRIBUTION} binary/dists/${DISTRIBUTION}
-	done
-
-	case "${LH_BINARY_IMAGES}" in
-		usb*)
-			;;
-
-		*)
-			ln -s . binary/debian
-			;;
-	esac
-
-	# Including preseeding files
-	if Find_files config/binary_debian-installer/*.cfg
-	then
-		cp config/binary_debian-installer/*.cfg binary/install
-	fi
-fi
-
-Repack_initrd()
-{
-	local TARGET_INITRD
-	local INCLUDE_PATH
-	TARGET_INITRD="${1}"
-	INCLUDE_PATH="${2}"
-	REPACK_TMPDIR="unpacked-initrd"
-
-	if [ -d "${INCLUDE_PATH}" ]
-	then
-		INCLUDE_PATH=$(readlink -f ${INCLUDE_PATH})
-	fi
-
-	# cpio does not have a "extract to directory", so we must change directory
-	mkdir -p ${REPACK_TMPDIR}
-	cd ${REPACK_TMPDIR}
-
-	gzip -d < ../${TARGET_INITRD} | cpio -i --make-directories --no-absolute-filenames
-	if [ ! -d "${INCLUDE_PATH}" ]
-	then
-		# Invoked the old way, just copy the preseeds
-		cp ../config/binary_debian-installer/*.cfg .
-	else
-		# New way, include target directory content in the initrd
-		REPACK_TMPDIR_ABS="${PWD}"
-		cd "${INCLUDE_PATH}"
-		find -print0 | cpio -pumd0 --no-preserve-owner "${REPACK_TMPDIR_ABS}/"
-		cd "${OLDPWD}"
-	fi
-	find -print0 | cpio -H newc -o0 | gzip -9 > ../${TARGET_INITRD}
-
-	cd ..
-	rm -rf ${REPACK_TMPDIR}
-}
-
-# Preseed d-i by repacking the initrd in certain situations
-if [ "${DI_IMAGE_TYPE}" = "netboot" ] && [ -e config/binary_debian-installer/preseed.cfg ]
-then
-	Repack_initrd "${DESTDIR}"/"${INITRD_DI}"
-
-	if [ -e "${DESTDIR}"/"${INITRD_GI}" ]
-	then
-		Repack_initrd "${DESTDIR}"/"${INITRD_GI}"
-	fi
-fi
-
-# Include content of config/binary_debian-installer-includes if exists and not empty
-if [ -d config/binary_debian-installer-includes ] && [ -n "$(ls -A config/binary_debian-installer-includes)" ]
-then
-	Repack_initrd "${DESTDIR}"/"${INITRD_DI}" config/binary_debian-installer-includes
-
-	if [ -e "${DESTDIR}"/"${INITRD_GI}" ]
-	then
-		Repack_initrd "${DESTDIR}"/"${INITRD_GI}" config/binary_debian-installer-includes
-	fi
-fi
-
-# Saving cache
-Save_cache cache/packages_binary
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_debian-installer
diff --git a/helpers/binary_disk b/helpers/binary_disk
deleted file mode 100755
index 69f2e0b..0000000
--- a/helpers/binary_disk
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/bin/sh
-
-# lh_binary_disk (1) - install disk information into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'install disk information into binary')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-case "${LH_BINARY_IMAGES}" in
-	iso*|usb*)
-		;;
-	*)
-		exit 0
-		;;
-esac
-
-Echo_message "Begin installing disk information..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_disk
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-mkdir -p binary/.disk
-
-ARCHITECTURE="$(echo ${LH_ARCHITECTURE} | sed -e 's| |/|g')"
-DISTRIBUTION="$(echo ${LH_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
-DISTRIBUTION="${DISTRIBUTION}$(echo ${LH_DISTRIBUTION} | cut -b 2-)"
-eval VERSION="$`echo RELEASE_${LH_DISTRIBUTION}`"
-
-TITLE="Debian GNU/Linux"
-case "${LH_MODE}" in
-	debian)
-		STRING="Official Snapshot ${ARCHITECTURE}"
-		TRACE="project/trace/ftp-master.debian.org"
-		;;
-
-	debian-release)
-		STRING="Official ${ARCHITECTURE}"
-		TRACE="project/trace/ftp-master.debian.org"
-		;;
-
-	ubuntu)
-		TITLE="Ubuntu"
-		STRING="Build ${ARCHITECTURE}"
-		TRACE=""
-		;;
-
-	*)
-		STRING="Snapshot ${ARCHITECTURE}"
-		TRACE=""
-		;;
-esac
-
-if [ -n "${TRACE}" ]
-then
-	echo "$(wget -q ${LH_MIRROR_BOOTSTRAP}/${TRACE} -O - | head -n 1)" \
-	> binary/.disk/archive_trace
-fi
-
-case "${LH_DEBIAN_INSTALLER}" in
-	cdrom)
-		echo "main" > binary/.disk/base_components
-
-		touch binary/.disk/base_installable
-
-		echo "full_cd" > binary/.disk/cd_type
-
-		echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/CD Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
-
-		cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_udeb_include binary/.disk/udeb_include
-		;;
-
-	true|netinst|live)
-		echo "main" > binary/.disk/base_components
-
-		touch binary/.disk/base_installable
-
-		echo "not_complete" > binary/.disk/cd_type
-
-		if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
-		then
-			echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/INSTALL Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
-		else
-			echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/NETINST Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
-
-		fi
-
-		cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_netinst_udeb_include binary/.disk/udeb_include
-
-		if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
-		then
-			echo "live-installer" >> binary/.disk/udeb_include
-		fi
-		;;
-
-	businesscard)
-		echo "main" > binary/.disk/base_components
-
-		echo "not_complete" > binary/.disk/cd_type
-
-		echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/BC Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
-
-		cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_businesscard_udeb_include binary/.disk/udeb_include
-		;;
-
-	false)
-		echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
-		;;
-esac
-
-# Creating stage file
-Create_stagefile .stage/binary_disk
diff --git a/helpers/binary_encryption b/helpers/binary_encryption
deleted file mode 100755
index db32227..0000000
--- a/helpers/binary_encryption
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/bin/sh
-
-# lh_binary_encryption(1) - encrypts rootfs
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'encrypts rootfs')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ]
-then
-	exit 0
-fi
-
-case "${LH_ENCRYPTION}" in
-	aes128|aes192|aes256)
-		;;
-	""|false)
-		exit 0
-		;;
-	*)
-		Echo_error "Encryption type %s not supported." "${LH_ENCRYPTION}"
-		exit 1
-		;;
-esac
-
-case "${LH_CHROOT_FILESYSTEM}" in
-	ext2|squashfs)
-		;;
-
-	*)
-		Echo_error "Encryption not yet supported on %s filesystems." "${LH_CHROOT_FILESYSTEM}"
-		exit 1
-		;;
-esac
-
-Echo_message "Begin encrypting root filesystem image..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap .stage/binary_rootfs
-
-# Checking stage file
-Check_stagefile .stage/binary_encryption
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-case "${LH_INITRAMFS}" in
-	casper)
-		INITFS="casper"
-		;;
-
-	live-initramfs)
-		INITFS="live"
-		;;
-esac
-
-# Checking depends
-Check_package chroot/usr/bin/aespipe aespipe
-
-# Restoring cache
-Restore_cache cache/packages_binary
-
-# Installing depends
-Install_package
-
-Echo_message "Encrypting binary/%s/filesystem.%s with %s..." "${INITFS}" "${LH_CHROOT_FILESYSTEM}" "${LH_ENCRYPTION}"
-
-if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
-then
-	# Moving image
-	mv binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM} chroot
-fi
-
-while true
-do
-	echo
-	echo " **************************************"
-	Echo " ** Configuring encrypted filesystem **"
-	echo " **************************************"
-	Echo " (Passwords must be at least 20 characters long)"
-	echo
-
-	case "${LH_BUILD_WITH_CHROOT}" in
-		true)
-			if Chroot chroot aespipe -e ${LH_ENCRYPTION} -T \
-				< chroot/filesystem.${LH_CHROOT_FILESYSTEM} \
-				> chroot/filesystem.${LH_CHROOT_FILESYSTEM}.tmp
-			then
-				mv chroot/filesystem.${LH_CHROOT_FILESYSTEM}.tmp binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}
-				break
-			fi
-			;;
-		false)
-			if aespipe -e ${LH_ENCRYPTION} -T \
-				< binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM} \
-				> binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}.tmp
-			then
-				mv binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}.tmp binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}
-				break
-			fi
-			;;
-	esac
-
-	printf "\nThere was an error configuring encryption ... Retry? [Y/n] "
-	read ANSWER
-
-	if [ "$(echo "${ANSWER}" | cut -b1 | tr A-Z a-z)" = "n" ]
-	then
-		unset ANSWER
-		break
-	fi
-done
-	
-# Cleanup temporary filesystems
-rm -f chroot/filesystem.${LH_CHROOT_FILESYSTEM}
-rm -f chroot/filesystem.${LH_CHROOT_FILESYSTEM}.tmp
-rm -f binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}.tmp
-
-# Saving cache
-Save_cache cache/packages_binary
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_encryption
diff --git a/helpers/binary_grub b/helpers/binary_grub
deleted file mode 100755
index 6510680..0000000
--- a/helpers/binary_grub
+++ /dev/null
@@ -1,339 +0,0 @@
-#!/bin/sh
-
-# lh_binary_grub(1) - installs grub into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'installs grub into binary')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_BOOTLOADER}" != "grub" ]
-then
-	exit 0
-fi
-
-Echo_message "Begin installing grub..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_grub
-
-# Checking grub templates
-Check_templates grub
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Check architecture
-Check_architecture amd64 i386
-Check_crossarchitecture
-
-# Checking depends
-Check_package chroot/usr/sbin/grub grub
-
-# Restoring cache
-Restore_cache cache/packages_binary
-
-# Installing depends
-Install_package
-
-# Local functions
-Grub_live_entry ()
-{
-	LABEL="${1}"
-	KERNEL="${2}"
-	INITRD="${3}"
-	APPEND="${4}"
-
-	LINUX_LIVE="${LINUX_LIVE}\ntitle\t\tDebian GNU/Linux - ${LABEL}"
-	LINUX_LIVE="${LINUX_LIVE}\nkernel\t\t/${KERNEL} boot=${INITFS} live-config LH_BOOTAPPEND_LIVE ${APPEND}"
-	LINUX_LIVE="${LINUX_LIVE}\ninitrd\t\t/${INITRD}"
-}
-
-Grub_install_entry ()
-{
-	LABEL="${1}"
-	KERNEL="${2}"
-	INITRD="${3}"
-	APPEND="${4}"
-
-	QAPPEND="quiet"
-
-	for TYPE in Install Expert Rescue Auto
-	do
-		case "${TYPE}" in
-			Install)
-				TAPPEND="${APPEND} ${QAPPEND}"
-				;;
-
-			Expert)
-				TAPPEND="priority=low ${APPEND}"
-				;;
-
-			Rescue)
-				TAPPEND="rescue/enable=true ${APPEND} ${QAPPEND}"
-				;;
-
-			Auto)
-				TAPPEND="auto=true priority=critical ${APPEND} ${QAPPEND}"
-				;;
-		esac
-
-		case "${LABEL}" in
-			Text)
-				TYPE_SUFFIX=""
-				;;
-			GUI)
-				TYPE_SUFFIX="gui"
-				;;
-		esac
-
-
-		LINUX_INSTALL="${LINUX_INSTALL}\ntitle\t\t${LABEL} ${TYPE}"
-		LINUX_INSTALL="${LINUX_INSTALL}\nkernel\t\t/${KERNEL} ${TAPPEND} ${LH_BOOTAPPEND_INSTALL}"
-		LINUX_INSTALL="${LINUX_INSTALL}\ninitrd\t\t/${INITRD}"
-	done
-}
-
-case "${LH_INITRAMFS}" in
-	casper)
-		INITFS="casper"
-		;;
-
-	live-initramfs)
-		INITFS="live"
-		;;
-esac
-
-# Setting destination directory
-case "${LH_BINARY_IMAGES}" in
-	iso*|tar)
-		case "${LH_INITRAMFS}" in
-			casper)
-				DESTDIR_LIVE="binary/casper"
-				;;
-
-			live-initramfs)
-				DESTDIR_LIVE="binary/live"
-				;;
-		esac
-
-		DESTDIR_INSTALL="binary/install"
-		;;
-
-	usb*|net)
-		Echo_warning "Bootloader in this image type not yet supported by live-helper."
-		Echo_warning "This would produce a not bootable image, aborting (FIXME)."
-		exit 1
-	;;
-esac
-
-Check_multiarchitecture
-
-# Creating directory
-mkdir -p "${DESTDIR_LIVE}"
-
-# Setting boot parameters
-
-case "${LH_ENCRYPTION}" in
-	""|false)
-		;;
-	*)
-		LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
-esac
-
-if [ -n "${LH_USERNAME}" ]
-then
-	case "${LH_INITRAMFS}" in
-		casper)
-			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
-			;;
-
-		live-initramfs)
-			if [ "${LH_USERNAME}" != "user" ]
-			then
-				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
-			fi
-			;;
-	esac
-fi
-
-if [ -n "${LH_HOSTNAME}" ]
-then
-	case "${LH_INITRAMFS}" in
-		casper)
-			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
-			;;
-
-		live-initramfs)
-			if [ "${LH_HOSTNAME}" != "debian" ]
-			then
-				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
-			fi
-			;;
-	esac
-fi
-
-if [ "${LH_UNION_FILESYSTEM}" != "aufs" ]
-then
-	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}"
-fi
-
-if [ -n "${LH_NET_COW_PATH}" ]
-then
-	Echo_error "Net cow not yet supported on grub"
-	exit 1
-fi
-
-if [ "${LH_EXPOSED_ROOT}" != "false" ]
-then
-	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot"
-fi
-
-LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's|  ||')"
-
-# Parameters are listed at: linux/Documentation/kernel-parameters.txt
-FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal"
-
-# Assembling kernel configuration
-
-# Default entries
-DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
-DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
-DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')"
-
-Grub_live_entry "live" "$(basename ${DESTDIR_LIVE})/${DEFAULT_KERNEL}" "$(basename ${DESTDIR_LIVE})/${DEFAULT_INITRD}"
-Grub_live_entry "live (fail-safe mode)" "$(basename ${DESTDIR_LIVE})/${DEFAULT_KERNEL}" "$(basename ${DESTDIR_LIVE})/${DEFAULT_INITRD}" "${FAILSAFE}"
-
-for KERNEL in chroot/boot/vmlinuz-*
-do
-	VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')"
-
-	Grub_live_entry "live, kernel ${VERSION}" "$(basename ${DESTDIR_LIVE})/$(basename ${KERNEL})" "$(basename ${DESTDIR_LIVE})/initrd.img-${VERSION}"
-	Grub_live_entry "live, kernel ${VERSION} (fail-safe mode)" "$(basename ${DESTDIR_LIVE})/$(basename ${KERNEL})" "$(basename ${DESTDIR_LIVE})/initrd.img-${VERSION}" "${FAILSAFE}"
-done
-
-LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')"
-
-# Assembling debian-installer configuration
-if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
-then
-	LINUX_LIVE="title\t\tLive:\nroot\n\n${LINUX_LIVE}"
-	LINUX_INSTALL="title\t\tInstaller:\nroot"
-
-	VMLINUZ_DI="install/vmlinuz"
-	INITRD_DI="install/initrd.gz"
-	APPEND_DI="vga=normal"
-
-	VMLINUZ_GI="install/gtk/vmlinuz"
-	INITRD_GI="install/gtk/initrd.gz"
-	APPEND_GI="video=vesa:ywrap,mtrr vga=788"
-
-	if [ -f "binary/boot/${VMLINUZ_DI}" ] && [ -f "binary/boot/${INITRD_DI}" ]
-	then
-		Grub_install_entry "Text" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
-	fi
-
-	if [ -f "binary/boot/${VMLINUZ_GI}" ] && [ -f "binary/boot/${INITRD_GI}" ]
-	then
-		Grub_install_entry "GUI" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}"
-	fi
-fi
-
-LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')"
-
-# Assembling memtest configuration
-if [ -f "${DESTDIR_LIVE}"/memtest ]
-then
-	MEMTEST="title\t\tOther:\nroot"
-	MEMTEST="${MEMTEST}\n\ntitle\t\t${LH_MEMTEST}\nkernel\t\t/$(basename ${DESTDIR_LIVE})/memtest"
-	MEMTEST="$(/bin/echo ${MEMTEST} | sed -e 's|//|/|g')"
-fi
-
-# Copying templates
-mkdir -p binary/boot/grub
-cp -r "${TEMPLATES}"/* binary/boot/grub
-
-case ${LH_BINARY_IMAGES} in
-	iso*)
-		FILES="chroot/usr/lib/grub/*/stage2_eltorito"
-		;;
-
-	usb*|tar)
-		FILES="chroot/usr/lib/grub/*/stage1 chroot/usr/lib/grub/*/e2fs_stage1_5 chroot/usr/lib/grub/*/stage2"
-		;;
-esac
-
-if [ "${LH_BUILD_WITH_CHROOT}" = "false" ]
-then
-	FILES="$(echo ${FILES} | sed -e 's|chroot||g')"
-fi
-
-# Copying grub
-cp ${FILES} binary/boot/grub
-
-# Copying local configuration file
-if [ -f config/binary_grub/menu.lst ]
-then
-	cp config/binary_grub/menu.lst binary/boot/grub/menu.lst
-fi
-
-# Copying splash screen
-if [ -f config/binary_grub/splash.xpm.gz ]
-then
-	LH_GRUB_SPLASH="config/binary_grub/splash.xpm.gz"
-elif [ -f config/binary_grub/splash.xpm ]
-then
-	LH_GRUB_SPLASH="config/binary_grub/splash.xpm"
-fi
-
-if [ -n "${LH_GRUB_SPLASH}" ]
-then
-	if [ "${LH_GRUB_SPLASH}" = "none" ]
-	then
-		# Removing splash file
-		rm -f binary/boot/grub/splash.xpm.gz
-
-		# Removing splash entry
-		sed -i -e "s|splashimage.*||" binary/boot/grub/menu.lst
-	else
-		# Overwriting splash file
-		cp -f "${LH_GRUB_SPLASH}" binary/boot/grub
-		sed -i -e "s|splashimage.*|splashimage /boot/grub/$(basename ${LH_GRUB_SPLASH})|" binary/boot/grub/menu.lst
-	fi
-fi
-
-sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" -e "s|MEMTEST|${MEMTEST}|" binary/boot/grub/menu.lst
-sed -i -e "s|LH_BOOTAPPEND_INSTALL|${LH_BOOTAPPEND_INSTALL}|" -e "s|LH_BOOTAPPEND_LIVE|${LH_BOOTAPPEND_LIVE}|" binary/boot/grub/menu.lst
-
-sed -i -e 's|\ $||g' binary/boot/grub/menu.lst
-
-# Saving cache
-Save_cache cache/packages_binary
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_grub
diff --git a/helpers/binary_grub2 b/helpers/binary_grub2
deleted file mode 100755
index 7fa8f3a..0000000
--- a/helpers/binary_grub2
+++ /dev/null
@@ -1,309 +0,0 @@
-#!/bin/sh
-
-# lh_binary_grub2(1) - installs grub2 into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'installs grub2 into binary')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_BOOTLOADER}" != "grub2" ]
-then
-	exit 0
-fi
-
-Echo_message "Begin installing grub2..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_grub
-
-# Checking grub2 templates
-Check_templates grub2
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Check architecture
-Check_architecture amd64 i386
-Check_crossarchitecture
-
-# Checking depends
-Check_package chroot/usr/bin/grub-mkimage grub-pc
-
-# Restoring cache
-Restore_cache cache/packages_binary
-
-# Installing depends
-Install_package
-
-# Local functions
-Grub_live_entry ()
-{
-	LABEL="${1}"
-	KERNEL="${2}"
-	INITRD="${3}"
-	APPEND="${4}"
-
-	LINUX_LIVE="${LINUX_LIVE}\nmenuentry \"Debian GNU/Linux - ${LABEL}\" {"
-	LINUX_LIVE="${LINUX_LIVE}\nlinux\t\t/${KERNEL} boot=${INITFS} live-config LH_BOOTAPPEND_LIVE ${APPEND}"
-	LINUX_LIVE="${LINUX_LIVE}\ninitrd\t\t/${INITRD}"
-	LINUX_LIVE="${LINUX_LIVE}\n}"
-}
-
-Grub_install_entry ()
-{
-	LABEL="${1}"
-	KERNEL="${2}"
-	INITRD="${3}"
-	APPEND="${4}"
-
-	if [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
-	then
-		APPEND="${APPEND} quiet"
-	fi
-
-	LINUX_INSTALL="${LINUX_INSTALL}\nmenuentry \"Debian GNU/Linux - ${LABEL}\" {"
-	LINUX_INSTALL="${LINUX_INSTALL}\nlinux\t\t/${KERNEL} ${APPEND} LH_BOOTAPPEND_INSTALL"
-	LINUX_INSTALL="${LINUX_INSTALL}\ninitrd\t\t/${INITRD}"
-	LINUX_INSTALL="${LINUX_INSTALL}\n}"
-}
-
-case "${LH_INITRAMFS}" in
-	casper)
-		INITFS="casper"
-		;;
-
-	live-initramfs)
-		INITFS="live"
-		;;
-esac
-
-# Setting destination directory
-case "${LH_BINARY_IMAGES}" in
-	iso*|tar)
-		case "${LH_INITRAMFS}" in
-			casper)
-				DESTDIR_LIVE="binary/casper"
-				;;
-
-			live-initramfs)
-				DESTDIR_LIVE="binary/live"
-				;;
-		esac
-
-		DESTDIR_INSTALL="binary/install"
-		;;
-
-	usb*|net)
-		Echo_warning "Bootloader in this image type not yet supported by live-helper."
-		Echo_warning "This would produce a not bootable image, aborting (FIXME)."
-		exit 1
-	;;
-esac
-
-Check_multiarchitecture
-
-# Creating directory
-mkdir -p "${DESTDIR_LIVE}"
-
-# Setting boot parameters
-
-case "${LH_ENCRYPTION}" in
-	""|false)
-		;;
-	*)
-		LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
-esac
-
-if [ -n "${LH_USERNAME}" ]
-then
-	case "${LH_INITRAMFS}" in
-		casper)
-			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
-			;;
-
-		live-initramfs)
-			if [ "${LH_USERNAME}" != "user" ]
-			then
-				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
-			fi
-			;;
-	esac
-fi
-
-if [ -n "${LH_HOSTNAME}" ]
-then
-	case "${LH_INITRAMFS}" in
-		casper)
-			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
-			;;
-
-		live-initramfs)
-			if [ "${LH_HOSTNAME}" != "debian" ]
-			then
-				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
-			fi
-			;;
-	esac
-fi
-
-if [ "${LH_UNION_FILESYSTEM}" != "aufs" ]
-then
-	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}"
-fi
-
-if [ -n "${LH_NET_COW_PATH}" ]
-then
-	Echo_error "Net cow not yet supported on grub"
-	exit 1
-fi
-
-if [ "${LH_EXPOSED_ROOT}" != "false" ]
-then
-	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot"
-fi
-
-LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's|  ||')"
-
-# Parameters are listed at: linux/Documentation/kernel-parameters.txt
-FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal"
-
-# Assembling kernel configuration
-
-# Default entries
-DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
-DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
-DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')"
-
-Grub_live_entry "live" "$(basename ${DESTDIR_LIVE})/${DEFAULT_KERNEL}" "$(basename ${DESTDIR_LIVE})/${DEFAULT_INITRD}"
-Grub_live_entry "live (fail-safe mode)" "$(basename ${DESTDIR_LIVE})/${DEFAULT_KERNEL}" "$(basename ${DESTDIR_LIVE})/${DEFAULT_INITRD}" "${FAILSAFE}"
-
-for KERNEL in chroot/boot/vmlinuz-*
-do
-	VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')"
-
-	Grub_live_entry "live, kernel ${VERSION}" "$(basename ${DESTDIR_LIVE})/$(basename ${KERNEL})" "$(basename ${DESTDIR_LIVE})/initrd.img-${VERSION}"
-	Grub_live_entry "live, kernel ${VERSION} (fail-safe mode)" "$(basename ${DESTDIR_LIVE})/$(basename ${KERNEL})" "$(basename ${DESTDIR_LIVE})/initrd.img-${VERSION}" "${FAILSAFE}"
-done
-
-LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')"
-
-# Assembling debian-installer configuration
-if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
-then
-	LINUX_LIVE="#\t \"Live\"\n${LINUX_LIVE}"
-	LINUX_INSTALL="#\t \"Installer\"\n"
-
-	VMLINUZ_DI="install/vmlinuz"
-	INITRD_DI="install/initrd.gz"
-	APPEND_DI="vga=normal"
-
-	VMLINUZ_GI="install/gtk/vmlinuz"
-	INITRD_GI="install/gtk/initrd.gz"
-	APPEND_GI="video=vesa:ywrap,mtrr vga=788"
-
-	Grub_install_entry "install" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
-	Grub_install_entry "installgui" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}"
-	Grub_install_entry "expert" "${VMLINUZ_DI}" "${INITRD_DI}" "priority=low ${APPEND_DI}"
-	Grub_install_entry "expertgui" "${VMLINUZ_GI}" "${INITRD_GI}" "priority=low ${APPEND_GI}"
-	Grub_install_entry "rescue" "${VMLINUZ_DI}" "${INITRD_DI}" "rescue/enable=true ${APPEND_DI}"
-	Grub_install_entry "rescuegui" "${VMLINUZ_GI}" "${INITRD_GI}" "rescue/enable=true ${APPEND_GI}"
-	Grub_install_entry "auto" "${VMLINUZ_DI}" "${INITRD_DI}" "auto=true priority=critical ${APPEND_DI}"
-	Grub_install_entry "autogui" "${VMLINUZ_GI}" "${INITRD_GI}" "auto=true priority=critical ${APPEND_GI}"
-fi
-
-LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')"
-
-# Assembling memtest configuration
-if [ -f "${DESTDIR_LIVE}"/memtest ]
-then
-	MEMTEST="#\t \"Other\"\n"
-	MEMTEST="${MEMTEST}\nmenuentry\t\"${LH_MEMTEST}\" {\nlinux16\t$(basename ${DESTDIR_LIVE})/memtest\n}"
-	MEMTEST="$(/bin/echo ${MEMTEST} | sed -e 's|//|/|g')"
-fi
-
-# Copying templates
-mkdir -p binary/boot/grub
-cp -r "${TEMPLATES}"/* binary/boot/grub
-
-case ${LH_BINARY_IMAGES} in
-	iso*)
-		FILES="chroot/usr/lib/grub/i386-pc/*.mod chroot/usr/lib/grub/i386-pc/*.lst chroot/usr/lib/grub/i386-pc/efiemu??.o chroot/usr/share/grub/*.pf2"
-		;;
-
-	usb*|tar)
-		FILES="chroot/usr/lib/grub/i386-pc/*"
-		;;
-esac
-
-if [ "${LH_BUILD_WITH_CHROOT}" = "false" ]
-then
-	FILES="$(echo ${FILES} | sed -e 's|chroot||g')"
-fi
-
-# Copying grub
-cp ${FILES} binary/boot/grub
-
-# Copying local configuration file
-if [ -f config/binary_grub/grub.cfg ]
-then
-	cp config/binary_grub/grub.cfg binary/boot/grub/grub.cfg
-fi
-
-# Copying splash screen
-if [ -f config/binary_grub/splash.tga ]
-then
-	LH_GRUB_SPLASH="config/binary_grub/splash.tga"
-fi
-
-if [ -n "${LH_GRUB_SPLASH}" ]
-then
-	if [ "${LH_GRUB_SPLASH}" = "none" ]
-	then
-		# Removing splash file
-		rm -f binary/boot/grub/splash.tga
-
-		# Removing splash entry
-		sed -i -e "s|background_image.*||" binary/boot/grub/grub.cfg
-	else
-		# Overwriting splash file
-		cp -f "${LH_GRUB_SPLASH}" binary/boot/grub
-		sed -i -e "s|background_image .*.tga|background_image \$\(root\)/boot/grub/$(basename ${LH_GRUB_SPLASH})|" binary/boot/grub/grub.cfg
-	fi
-fi
-
-sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" -e "s|MEMTEST|${MEMTEST}|" binary/boot/grub/grub.cfg
-sed -i -e "s|LH_BOOTAPPEND_INSTALL|${LH_BOOTAPPEND_INSTALL}|" -e "s|LH_BOOTAPPEND_LIVE|${LH_BOOTAPPEND_LIVE}|" binary/boot/grub/grub.cfg
-
-sed -i -e 's|\ $||g' binary/boot/grub/grub.cfg
-
-# Saving cache
-Save_cache cache/packages_binary
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_grub
diff --git a/helpers/binary_includes b/helpers/binary_includes
deleted file mode 100755
index 8483f72..0000000
--- a/helpers/binary_includes
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/bin/sh
-
-# lh_binary_includes(1) - copy files into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'copy files into binary')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_INCLUDES}" = "none" ]
-then
-	exit 0
-fi
-
-Echo_message "Begin copying binary includes..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_includes
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Check user includes
-if [ ! -d "${LH_INCLUDES}" ]
-then
-	if [ -d ../"${LH_INCLUDES}" ]
-	then
-		LH_INCLUDES="../${LH_INCLUDES}"
-	else
-		Echo_error "user specified includes not accessible in %s" "${LH_INCLUDES}"
-		exit 1
-	fi
-fi
-
-# Checking local includes
-if [ -d config/includes/"${LH_DISTRIBUTION}" ]
-then
-	LH_INCLUDES="config/includes"
-fi
-
-# Assemble architecture
-case "${LH_ARCHITECTURE}" in
-	amd64)
-		ARCH="amd"
-		;;
-
-	i386)
-		ARCH="386"
-		;;
-
-	powerpc)
-		ARCH="ppc"
-		;;
-
-	sparc)
-		ARCH="spa"
-		;;
-esac
-
-# Working arround vfat limitations
-case "${LH_BINARY_IMAGES}" in
-	usb*)
-		case "${LH_BINARY_FILESYSTEM}" in
-			fat*)
-				CP_OPTIONS="-L"
-				;;
-		esac
-		;;
-esac
-
-# Copying common templates
-if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common ] && \
-Find_files "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common/*
-then
-	cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common/* binary
-fi
-
-if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common."${ARCH}" ] && \
-Find_files "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common."${ARCH}"/*
-then
-	cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common."${ARCH}"/* binary
-fi
-
-# Copying live templates
-if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live ] && \
-Find_files "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live/*
-then
-	cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live/* binary
-fi
-
-if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live."${ARCH}" ] && \
-Find_files "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live."${ARCH}"/*
-then
-	cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live."${ARCH}"/* binary
-fi
-
-if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
-then
-	# Copying install templates
-	if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install ] && \
-	Find_files "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install/*
-	then
-		cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install/* binary
-	fi
-
-	if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}" ] && \
-	Find_files "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}"/*
-	then
-		cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}"/* binary
-	fi
-
-	# Adjusting install templates
-	ARCHITECTURE="$(echo ${LH_ARCHITECTURE} | sed -e 's| |/|g')"
-	DISTRIBUTION="$(echo ${LH_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
-	DISTRIBUTION="${DISTRIBUTION}$(echo ${LH_DISTRIBUTION} | cut -b 2-)"
-	eval VERSION="$`echo RELEASE_${LH_DISTRIBUTION}`"
-
-	if [ -d binary/pool/main/l/live-installer ]
-	then
-		TYPE="LIVE/INSTALL"
-	fi
-
-	TYPE="LIVE/NETINST"
-
-	DEBIAN_NAME="Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} ${TYPE} Binary $(date +%Y%m%d-%H:%M)"
-	DEBIAN_DATE="$(date +%Y%m%d-%H:%M)"
-
-	if [ "${LH_ARCHITECTURE}" = "i386" ]
-	then
-		DEBIAN_TOOLS_HTML=" <P>\n <tt>&nbsp;\n <A href="tools/">/tools/</a>\n </tt>\n\n and\n <tt>&nbsp;\n <A href="install/floppy/">/install/floppy/</a>\n </tt>"
-		DEBIAN_TOOLS_TXT="/tools/ and   /install/floppy/"
-	else
-		DEBIAN_TOOLS_HTML=" <P>\n <tt>&nbsp;\n <A href="tools/">/tools/</a>\n </tt>\n\n\n\n\n\n"
-		DEBIAN_TOOLS_TXT="/tools/"
-	fi
-
-	if [ -f binary/README.html ]
-	then
-		sed -i -e "s|DEBIAN_NAME|${DEBIAN_NAME}|g" -e "s|DEBIAN_DATE|${DEBIAN_DATE}|g" -e "s|DEBIAN_TOOLS|${DEBIAN_TOOLS_HTML}|g" binary/README.html
-		sed -i -e "s|DEBIAN_NAME|${DEBIAN_NAME}|g" -e "s|DEBIAN_DATE|${DEBIAN_DATE}|g" -e "s|DEBIAN_TOOLS|${DEBIAN_TOOLS_TXT}|g" binary/README.txt
-	fi
-fi
-
-# Creating stage file
-Create_stagefile .stage/binary_includes
diff --git a/helpers/binary_iso b/helpers/binary_iso
deleted file mode 100755
index 88a042d..0000000
--- a/helpers/binary_iso
+++ /dev/null
@@ -1,228 +0,0 @@
-#!/bin/sh
-
-# lh_binary_iso(1) - build iso binary image
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'build iso binary image')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-case "${LH_BINARY_IMAGES}" in
-	iso)
-		IMAGE="binary.iso"
-		;;
-
-	iso-hybrid)
-		IMAGE="binary-hybrid.iso"
-		;;
-
-	*)
-		exit 0
-		;;
-esac
-
-Echo_message "Begin building binary iso image..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_iso
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Checking depends
-Check_package chroot/usr/bin/genisoimage genisoimage
-
-if [ "${LH_BINARY_IMAGES}" = "iso-hybrid" ]
-then
-	Check_package chroot/usr/bin/isohybrid syslinux
-fi
-
-# Restoring cache
-Restore_cache cache/packages_binary
-
-# Installing depends
-Install_package
-
-# Remove old iso image
-if [ -f ${IMAGE} ]
-then
-	rm -f ${IMAGE}
-fi
-
-# Handle genisoimage generic options
-GENISOIMAGE_OPTIONS="-J -l -cache-inodes -allow-multidot"
-
-# Handle genisoimage live-helper specific options
-if [ "${_QUIET}" = "true" ]
-then
-	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet"
-fi
-
-if [ "${_VERBOSE}" = "true" ]
-then
-	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
-fi
-
-if [ -n "${LH_ISO_APPLICATION}" ] && [ "${LH_ISO_APPLICATION}" != "none" ]
-then
-	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LH_ISO_APPLICATION}\""
-fi
-
-if [ -n "${LH_ISO_PREPARER}" ] && [ "${LH_ISO_PREPARER}" != "none" ]
-then
-	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LH_ISO_PREPARER}\""
-fi
-
-if [ -n "${LH_ISO_PUBLISHER}" ] && [ "${LH_ISO_PUBLISHER}" != "none" ]
-then
-	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LH_ISO_PUBLISHER}\""
-fi
-
-if [ -n "${LH_ISO_VOLUME}" ] && [ "${LH_ISO_VOLUME}" != "none" ]
-then
-	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LH_ISO_VOLUME}\""
-fi
-
-# Handle genisoimage architecture specific options
-case "${LH_BOOTLOADER}" in
-	grub)
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/grub/stage2_eltorito"
-		GENISOIMAGE_EXCLUDE="boot/grub/stage2_eltorito"
-		;;
-
-	grub2)
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/grub/grub_eltorito -J"
-		GENISOIMAGE_EXCLUDE="boot/grub/grub_eltorito"
-		;;
-
-	silo)
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -G boot/isofs.b -B ..."
-		GENISOIMAGE_EXCLUDE="boot/isofs.b"
-		;;
-
-	syslinux)
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b isolinux/isolinux.bin -c isolinux/boot.cat"
-		GENISOIMAGE_EXCLUDE="isolinux/isolinux.bin"
-		;;
-
-	yaboot)
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r --iso-level 2 --netatalk -hfs -probe -map"
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} binary/yaboot/hfs.map --chrp-boot -part -no-desktop"
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -hfs-bless binary/yaboot -hfs-volid Debian/Live_powerpc"
-		GENISOIMAGE_EXCLUDE="yaboot/hfs.map"
-		;;
-
-	*)
-		Echo_warning "Bootloader on your architecture not yet supported by live-helper."
-		Echo_warning "This will produce a most likely not bootable image (Continuing in 5 seconds)."
-		sleep 5
-		;;
-esac
-
-if In_list "stripped minimal" "${LH_PACKAGES_LISTS}"
-then
-	if [ "${LH_DEBIAN_INSTALLER}" != "live" ]
-	then
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}"
-	fi
-fi
-
-if [ "${LH_BOOTLOADER}" = "grub2" ]
-then
-
-cat > binary.sh << EOF
-#!/bin/sh
-
-input_dir=/usr/lib/grub/i386-pc
-
-# build core.img
-core_img=\$(mktemp)
-grub-mkimage -d \${input_dir} -o \${core_img} biosdisk iso9660
-
-# build grub_eltorito image
-cat \${input_dir}/cdboot.img \${core_img} > binary/boot/grub/grub_eltorito
-
-rm -f \${core_img}
-
-for file in \${input_dir}/*.mod \${input_dir}/efiemu??.o \
-	\${input_dir}/command.lst \${input_dir}/moddep.lst \${input_dir}/fs.lst \
-	\${input_dir}/handler.lst \${input_dir}/parttool.lst
-do
-	if test -f "\$file"
-	then
-		cp -f "\$file" binary/boot/grub
-	fi
-done
-EOF
-
-else
-	echo "#!/bin/sh" > binary.sh
-fi
-
-cat >> binary.sh << EOF
-
-genisoimage ${GENISOIMAGE_OPTIONS} -o ${IMAGE} binary
-EOF
-
-if [ "${LH_BINARY_IMAGES}" = "iso-hybrid" ]
-then
-
-cat >> binary.sh << EOF
-
-isohybrid ${ISOHYBRID_OPTIONS} ${IMAGE}
-EOF
-
-fi
-
-case "${LH_BUILD_WITH_CHROOT}" in
-	true)
-		# Moving image
-		mv binary.sh chroot
-		mv binary chroot
-
-		Chroot chroot "sh binary.sh"
-
-		# Move image
-		mv chroot/binary chroot/${IMAGE} ./
-		rm -f chroot/binary.sh
-		;;
-
-	false)
-		sh binary.sh
-		rm -f binary.sh
-		;;
-esac
-
-# Saving cache
-Save_cache cache/packages_binary
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_iso
diff --git a/helpers/binary_linux-image b/helpers/binary_linux-image
deleted file mode 100755
index c383a22..0000000
--- a/helpers/binary_linux-image
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-
-# lh_binary_linux-image(1) - install linux-image into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'install linux-image into binary')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ]
-then
-	exit 0
-fi
-
-Echo_message "Begin install linux-image..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_linux-image
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-case "${LH_INITRAMFS}" in
-	casper)
-		DESTDIR="binary/casper"
-		;;
-
-	live-initramfs)
-		DESTDIR="binary/live"
-		;;
-
-	*)
-		DESTDIR="binary/boot"
-		;;
-esac
-
-case "${LH_ARCHITECTURE}" in
-	powerpc)
-		LINUX="vmlinux"
-		;;
-
-	*)
-		LINUX="vmlinuz"
-		;;
-esac
-
-Check_multiarchitecture
-
-# Creating directory
-mkdir -p "${DESTDIR}"
-
-# Installing linux-image
-cp chroot/boot/"${LINUX}"-* "${DESTDIR}"
-cp chroot/boot/initrd.img-* "${DESTDIR}"
-
-case "${LH_INITRAMFS}" in
-	live-initramfs)
-		if [ -e chroot/usr/share/doc/live-initramfs/parameters.txt ]
-		then
-			cp chroot/usr/share/doc/live-initramfs/parameters.txt "${DESTDIR}"/parameters.txt
-		fi
-		;;
-esac
-
-# Creating stage file
-Create_stagefile .stage/binary_linux-image
diff --git a/helpers/binary_local-hooks b/helpers/binary_local-hooks
deleted file mode 100755
index ff24d08..0000000
--- a/helpers/binary_local-hooks
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-
-# lh_binary_local-hooks(1) - execute local hooks in binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'execute local hooks in binary')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin executing local hooks..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_local-hooks
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Processing local-hooks
-if Find_files config/binary_local-hooks/*
-then
-	for HOOK in config/binary_local-hooks/*
-	do
-		# Making hook executable
-		if [ ! -x "${HOOK}" ]
-		then
-			chmod +x "${HOOK}"
-		fi
-
-		# Executing hook
-		./"${HOOK}" || ( Echo_error "${HOOK} failed (exit non-zero). You should check for errors."; exit 1 )
-	done
-
-	# Creating stage file
-	Create_stagefile .stage/binary_local-hooks
-fi
diff --git a/helpers/binary_local-includes b/helpers/binary_local-includes
deleted file mode 100755
index 8c54466..0000000
--- a/helpers/binary_local-includes
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/sh
-
-# lh_binary_local-includes(1) - copy files into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'copy files into binary')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin copying binary local includes..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_local-includes
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if Find_files config/binary_local-includes/
-then
-	# Copying includes
-	cd config/binary_local-includes
-	find . | cpio -dmpu --no-preserve-owner "${OLDPWD}"/binary
-	cd "${OLDPWD}"
-
-	# Removing symlinks
-	case "${LH_BINARY_IMAGES}" in
-		usb*)
-			find binary -type l | xargs rm -f
-			;;
-	esac
-
-	# Creating stage file
-	Create_stagefile .stage/binary_local-includes
-fi
diff --git a/helpers/binary_local-packageslists b/helpers/binary_local-packageslists
deleted file mode 100755
index c5381f4..0000000
--- a/helpers/binary_local-packageslists
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/bin/sh
-
-# lh_binary_local-packageslists(1) - install local packages lists into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'install local packages into binary')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin installing local packages lists..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_local-packageslists
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if Find_files config/binary_local-packageslists/*
-then
-	# Restoring cache
-	Restore_cache cache/packages_chroot
-
-	# Check depends
-	Check_package chroot/usr/bin/apt-ftparchive apt-utils
-
-	# Installing depends
-	Install_package
-
-	mkdir -p chroot/binary.deb/archives/partial
-	mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
-	touch chroot/var/lib/dpkg/status
-
-	for PACKAGESLIST in config/binary_local-packageslists/*
-	do
-		# Generate package list
-		Expand_packagelist "${PACKAGESLIST}" "config/binary_local-packageslists" "config/chroot_local-packageslists" > chroot/root/"$(basename ${PACKAGESLIST})"
-
-		# Downloading additional packages
-		Chroot chroot "xargs --arg-file=/root/$(basename ${PACKAGESLIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install"
-
-		# Remove package list
-		rm chroot/root/"$(basename ${PACKAGESLIST})"
-	done
-
-	for FILE in chroot/binary.deb/archives/*.deb
-	do
-		SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')"
-		SECTION="$(dpkg -f ${FILE} Section | awk '{ print $1 }')"
-
-		if [ -z "${SOURCE}" ]
-		then
-			SOURCE="$(basename ${FILE} | awk -F_ '{ print $1 }')"
-		fi
-
-		case "${SOURCE}" in
-			lib?*)
-				LETTER="$(echo ${SOURCE} | sed 's|\(....\).*|\1|')"
-				;;
-
-			*)
-				LETTER="$(echo ${SOURCE} | sed 's|\(.\).*|\1|')"
-				;;
-		esac
-
-		if echo "${SECTION}" | grep -qs contrib
-		then
-			SECTION="contrib"
-		elif echo "${SECTION}" | grep -qs non-free
-		then
-			SECTION="non-free"
-		else
-			SECTION="main"
-		fi
-
-		# Install directory
-		mkdir -p binary/pool/${SECTION}/"${LETTER}"/"${SOURCE}"
-
-		# Move files
-		mv "${FILE}" binary/pool/${SECTION}/"${LETTER}"/"${SOURCE}"
-	done
-
-	cd binary
-
-	for SECTION in pool/*
-	do
-		SECTION="$(basename ${SECTION})"
-
-		mkdir -p dists/${LH_DISTRIBUTION}/${SECTION}/binary-${LH_ARCHITECTURE}
-		apt-ftparchive packages pool/${SECTION} > dists/${LH_DISTRIBUTION}/${SECTION}/binary-${LH_ARCHITECTURE}/Packages
-		gzip -9 -c dists/${LH_DISTRIBUTION}/${SECTION}/binary-${LH_ARCHITECTURE}/Packages > dists/${LH_DISTRIBUTION}/${SECTION}/binary-${LH_ARCHITECTURE}/Packages.gz
-	done
-
-	cd "${OLDPWD}"
-
-	rm -rf chroot/binary.deb
-	mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
-
-	# Removing depends
-	Remove_package
-
-	# Saving cache
-	Save_cache cache/packages_chroot
-
-	# Creating stage file
-	Create_stagefile .stage/binary_local-packageslists
-fi
diff --git a/helpers/binary_manifest b/helpers/binary_manifest
deleted file mode 100755
index 2777ada..0000000
--- a/helpers/binary_manifest
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-
-# lh_binary_manifest(1) - create manifest
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'create manifest')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ]
-then
-	exit 0
-fi
-
-Echo_message "Begin creating manifest..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_manifest
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-case "${LH_INITRAMFS}" in
-	casper)
-		INITFS="casper"
-		SUFFIX="manifest"
-		;;
-
-	live-initramfs)
-		INITFS="live"
-		SUFFIX="packages"
-		;;
-esac
-
-# Add filesystem.packages
-Chroot chroot "dpkg-query -W" > binary/"${INITFS}"/filesystem.${SUFFIX}
-
-# Copy manifest as build output.
-cp binary/"${INITFS}"/filesystem.${SUFFIX} binary.${SUFFIX}
-
-# Creating stage file
-Create_stagefile .stage/binary_manifest
diff --git a/helpers/binary_memtest b/helpers/binary_memtest
deleted file mode 100755
index 8afcb9f..0000000
--- a/helpers/binary_memtest
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/sh
-
-# lh_binary_memtest(1) - installs a memtest into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'installs a memtest into binary')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ] || [ "${LH_MEMTEST}" = "false" ] || [ "${LH_MEMTEST}" = "none" ]
-then
-	exit 0
-fi
-
-Echo_message "Begin installing memtest..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_memtest
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LH_ARCHITECTURE}" != "amd64" ] && [ "${LH_ARCHITECTURE}" != "i386" ]
-then
-	Echo_warning "skipping binary_memtest, foreign architecture."
-	exit 0
-fi
-
-if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
-then
-
-	if [ -f chroot/usr/sbin/grub ] && [ ! -f chroot/boot/grub/menu.lst ]
-	then
-		GRUB="yes"
-
-		mkdir -p chroot/boot/grub
-		touch chroot/boot/grub/menu.lst
-	fi
-fi
-
-# Checking depends
-case "${LH_MEMTEST}" in
-	memtest86)
-		Check_package chroot/boot/memtest86.bin memtest86
-		;;
-
-	memtest86+)
-		Check_package chroot/boot/memtest86+.bin memtest86+
-		;;
-esac
-
-# Restoring cache
-Restore_cache cache/packages_binary
-
-# Installing depends
-Install_package
-
-# Setting destination directory
-case "${LH_INITRAMFS}" in
-	casper)
-		DESTDIR="binary/casper"
-		;;
-
-	live-initramfs)
-		DESTDIR="binary/live"
-		;;
-esac
-
-Check_multiarchitecture
-
-# Creating directory
-mkdir -p "${DESTDIR}"
-
-# Installing memtest
-case "${LH_BUILD_WITH_CHROOT}" in
-	true)
-		cp chroot/boot/${LH_MEMTEST}.bin "${DESTDIR}"/memtest
-		;;
-
-	false)
-		cp /boot/${LH_MEMTEST}.bin "${DESTDIR}"/memtest
-		;;
-esac
-
-# Saving cache
-Save_cache cache/packages_binary
-
-# Removing depends
-Remove_package
-
-if [ "${GRUB}" ]
-then
-	rm -rf chroot/boot/grub
-fi
-
-# Creating stage file
-Create_stagefile .stage/binary_memtest
diff --git a/helpers/binary_net b/helpers/binary_net
deleted file mode 100755
index 273c383..0000000
--- a/helpers/binary_net
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/bin/sh
-
-# lh_binary_net(1) - build netboot binary image
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'build netboot binary image')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if ! In_list net "${LH_BINARY_IMAGES}"
-then
-	exit 0
-fi
-
-if [ "${LH_NET_TARBALL}" = "none" ]
-then
-	exit 0
-fi
-
-Echo_message "Begin building binary netboot image..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_net
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LH_ARCHITECTURE}" = "sparc" ]
-then
-	# Checking depends
-	Check_package chroot/usr/bin/elftoaout sparc-utils
-
-	# Restoring cache
-	Restore_cache cache/packages_binary
-
-	# Installing depends
-	Install_package
-
-	# Set target and source directories
-	DESTDIR="tftpboot"
-	case "${LH_INITRAMFS}" in
-		casper)
-			ORIGDIR="binary/casper"
-			;;
-
-		live-initramfs)
-			ORIGDIR="binary/live"
-			;;
-	esac
-
-	# Find defaults
-	DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
-	DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
-	DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')"
-	DEFAULT_MAP="$(echo chroot/boot/System.map-*${DEFAULT_FLAVOUR})"
-
-	gzip -cd ${ORIGDIR}/${DEFAULT_KERNEL} > kernel.tmp
-
-	mkdir -p ${DESTDIR}
-	rm -f ${DESTDIR}/boot.img
-	elftoaout -o ${DESTDIR}/boot.img kernel.tmp
-
-	case "${DEFAULT_FLAVOUR}" in
-		sparc32)
-			piggyback ${DESTDIR}/boot.img ${DEFAULT_MAP} ${ORIGDIR}/${DEFAULT_INITRD}
-			;;
-		sparc64)
-			piggyback64 ${DESTDIR}/boot.img ${DEFAULT_MAP} ${ORIGDIR}/${DEFAULT_INITRD}
-			;;
-		*)
-			Echo_error "Invalid default kernel flavour for sparc \"%s\"" "${DEFAULT_FLAVOUR}"
-			exit 1;
-			;;
-	esac
-
-	# Pad boot.img
-	REMAINDER=$((( 4 - $(stat -c %s ${DESTDIR}/boot.img) % 4 ) % 4))
-	dd if=/dev/zero bs=1 count=${REMAINDER} >> ${DESTDIR}/boot.img
-
-	# No need for kernel and initrd images in the binary
-	rm -f ${ORIGDIR}/vmlinuz-*
-	rm -f ${ORIGDIR}/initrd.img-*
-
-	# Clean temporaries
-	rm -f kernel.tmp
-
-	# Saving cache
-	Save_cache cache/packages_binary
-
-	# Removing depends
-	Remove_package
-fi
-
-# Remove old binary
-rm -f binary-net.tar.bz2
-rm -f binary-net.tar.gz
-rm -f binary-net.tar
-
-# Creating image file
-ROOT_DIR=$(basename ${LH_NET_ROOT_PATH})
-if [ "${ROOT_DIR}" = "chroot" ]
-then
-	mv chroot chroot.tmp
-fi
-
-if [ "${ROOT_DIR}" != "binary" ]
-then
-	mv binary ${ROOT_DIR}
-fi
-
-mkdir binary.tmp
-mv ${ROOT_DIR} tftpboot binary.tmp
-cd binary.tmp
-
-case "${LH_NET_TARBALL}" in
-	bzip2)
-		tar cfj ../binary-net-tar.bz2 *
-		;;
-
-	gzip)
-		tar cf ../binary-net.tar *
-		gzip ${GZIP_OPTIONS} ../binary-net.tar
-		;;
-
-	tar)
-		tar cf ../binary-net.tar *
-		;;
-esac
-
-mv * ../
-cd "${OLDPWD}"
-rmdir binary.tmp
-
-if [ "${ROOT_DIR}" != "binary" ]
-then
-	mv ${ROOT_DIR} binary
-fi
-
-if [ "${ROOT_DIR}" = "chroot" ]
-then
-	mv chroot.tmp chroot
-fi
-
-# Creating stage file
-Create_stagefile .stage/binary_net
diff --git a/helpers/binary_rootfs b/helpers/binary_rootfs
deleted file mode 100755
index 7aa4fb7..0000000
--- a/helpers/binary_rootfs
+++ /dev/null
@@ -1,437 +0,0 @@
-#!/bin/sh
-
-# lh_binary_rootfs(1) - build rootfs image
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'build rootfs image')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin building root filesystem image..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap .stage/binary_chroot
-
-# Checking stage file
-Check_stagefile .stage/binary_rootfs
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-case "${LH_ARCHITECTURE}" in
-	amd64|i386)
-		LINUX="vmlinuz"
-		;;
-
-	powerpc)
-		LINUX="vmlinux"
-		;;
-esac
-
-case "${LH_INITRAMFS}" in
-	casper)
-		INITFS="casper"
-		;;
-
-	live-initramfs)
-		INITFS="live"
-		;;
-esac
-
-# Creating directory
-mkdir -p binary/${INITFS}
-
-for STAGE in ${LH_CACHE_STAGES}
-do
-	if [ "${STAGE}" = "rootfs" ] && [ -d cache/stages_rootfs ]
-	then
-		# Removing old chroot
-		rm -rf binary/"${INITFS}"/filesystem.*
-
-		# Restoring old cache
-		mkdir -p binary/"${INITFS}"
-		${LH_ROOT_COMMAND} cp -a cache/stages_rootfs/filesystem.* binary/"${INITFS}"
-
-		if [ -n "${LH_ROOT_COMMAND}" ]
-		then
-			${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) binary
-		fi
-
-		# Creating stage file
-		Create_stagefile .stage/binary_rootfs
-		exit 0
-	fi
-done
-
-case "${LH_CHROOT_FILESYSTEM}" in
-	ext2|ext3)
-		# Checking depends
-		Check_package chroot/usr/bin/genext2fs genext2fs
-
-		# Restoring cache
-		Restore_cache cache/packages_binary
-
-		# Installing depends
-		Install_package
-
-		# Remove old image
-		if [ -f binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM} ]
-		then
-			rm -f binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}
-		fi
-
-		DU_DIM="$(du -ks chroot/chroot | cut -f1)"
-		REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LH_CHROOT_FILESYSTEM})"
-
-		RESERVED_PERCENTAGE="--reserved-percentage"
-
-		case "${LH_BUILD_WITH_CHROOT}" in
-			true)
-				Chroot chroot "genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot filesystem.${LH_CHROOT_FILESYSTEM}"
-
-				# Move image
-				mv chroot/filesystem.${LH_CHROOT_FILESYSTEM} binary/${INITFS}
-
-				case "${LH_MODE}" in
-					ubuntu)
-						du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
-						;;
-				esac
-
-				if [ -e chroot/chroot.cache ]
-				then
-					rm -f .lock
-					mv chroot/chroot chroot.tmp
-
-					lh chroot_linux-image remove ${*}
-					lh chroot_sources remove ${*}
-					lh chroot_apt remove ${*}
-					lh chroot_hostname remove ${*}
-					lh chroot_resolv remove ${*}
-					lh chroot_hosts remove ${*}
-					lh chroot_sysv-rc remove ${*}
-					lh chroot_upstart remove ${*}
-					lh chroot_dpkg remove ${*}
-					lh chroot_debianchroot remove ${*}
-					lh chroot_sysfs remove ${*}
-					lh chroot_selinuxfs remove ${*}
-					lh chroot_proc remove ${*}
-					lh chroot_devpts remove ${*}
-
-					rm -rf chroot
-					mv chroot.tmp chroot
-
-					lh chroot_devpts install ${*}
-					lh chroot_proc install ${*}
-					lh chroot_selinuxfs install ${*}
-					lh chroot_sysfs install ${*}
-					lh chroot_debianchroot install ${*}
-					lh chroot_dpkg install ${*}
-					lh chroot_sysv-rc install ${*}
-					lh chroot_upstart install ${*}
-					lh chroot_hosts install ${*}
-					lh chroot_resolv install ${*}
-					lh chroot_hostname install ${*}
-					lh chroot_apt install ${*}
-					lh chroot_sources install ${*}
-					lh chroot_linux-image install ${*}
-
-					touch .lock
-				else
-					rm -rf chroot/chroot
-
-					# Removing depends
-					Remove_package
-				fi
-				;;
-
-			false)
-				genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}
-				;;
-		esac
-
-		# Saving cache
-		Save_cache cache/packages_binary
-		;;
-
-	jffs2)
-		# Checking depends
-		Check_package chroot/usr/sbin/mkfs.jffs2 mtd-tools
-
-		# Restoring cache
-		Restore_cache cache/packages_binary
-
-		# Installing depends
-		Install_package
-
-		# Remove old jffs2 image
-		if [ -f binary/${INITFS}/filesystem.jffs2 ]
-		then
-			rm -f binary/${INITFS}/filesystem.jffs2
-		fi
-
-		if [ -n "${LH_JFFS2_ERASEBLOCK}" ]
-		then
-			JFFS2_OPTIONS="--eraseblock=${LH_JFFS2_ERASEBLOCK}"
-		fi
-
-		case "${LH_BUILD_WITH_CHROOT}" in
-			true)
-				Chroot chroot "mkfs.jffs2 ${JFFS2_OPTIONS} --root=chroot --output filesystem.jffs2"
-
-				# Move image
-				mv chroot/filesystem.jffs2 binary/${INITFS}
-
-				if [ -e chroot/chroot.cache ]
-				then
-					rm -f .lock
-					mv chroot/chroot chroot.tmp
-
-					lh chroot_linux-image remove ${*}
-					lh chroot_sources remove ${*}
-					lh chroot_apt remove ${*}
-					lh chroot_hostname remove ${*}
-					lh chroot_resolv remove ${*}
-					lh chroot_hosts remove ${*}
-					lh chroot_sysv-rc remove ${*}
-					lh chroot_upstart remove ${*}
-					lh chroot_dpkg remove ${*}
-					lh chroot_debianchroot remove ${*}
-					lh chroot_sysfs remove ${*}
-					lh chroot_selinuxfs remove ${*}
-					lh chroot_proc remove ${*}
-					lh chroot_devpts remove ${*}
-
-					rm -rf chroot
-					mv chroot.tmp chroot
-
-					lh chroot_devpts install ${*}
-					lh chroot_proc install ${*}
-					lh chroot_selinuxfs install ${*}
-					lh chroot_sysfs install ${*}
-					lh chroot_debianchroot install ${*}
-					lh chroot_dpkg install ${*}
-					lh chroot_sysv-rc install ${*}
-					lh chroot_upstart install ${*}
-					lh chroot_hosts install ${*}
-					lh chroot_resolv install ${*}
-					lh chroot_hostname install ${*}
-					lh chroot_apt install ${*}
-					lh chroot_sources install ${*}
-					lh chroot_linux-image install ${*}
-
-					touch .lock
-				else
-					rm -rf chroot/chroot
-
-					# Removing depends
-					Remove_package
-				fi
-				;;
-
-			false)
-				mkfs.jffs2 ${JFFS2_OPTIONS} --root=chroot --output binary/${INITFS}/filesystem.jffs2
-				;;
-		esac
-
-		# Saving cache
-		Save_cache cache/packages_binary
-		;;
-
-	plain)
-		if [ -d binary/${INITFS}/filesystem.dir ]
-		then
-			rm -rf binary/${INITFS}/filesystem.dir
-		fi
-
-		case "${LH_BUILD_WITH_CHROOT}" in
-			true)
-				mv chroot/chroot binary/${INITFS}/filesystem.dir
-				;;
-
-			false)
-				cp -a chroot binary/${INITFS}/filesystem.dir
-				;;
-		esac
-		;;
-
-	squashfs)
-		# Checking depends
-		Check_package chroot/usr/share/doc/squashfs-tools squashfs-tools
-
-		# Restoring cache
-		Restore_cache cache/packages_binary
-
-		# Installing depends
-		Install_package
-
-		Echo_message "Preparing squashfs image..."
-		Echo_message "This may take a while."
-
-		# Remove old squashfs image
-		if [ -f binary/${INITFS}/filesystem.squashfs ]
-		then
-			rm -f binary/${INITFS}/filesystem.squashfs
-		fi
-
-		# Remove stale squashfs image
-		rm -f chroot/filesystem.squashfs
-
-		MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -no-progress"
-
-		if [ "${_VERBOSE}" = "true" ]
-		then
-			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info"
-		fi
-
-		if [ -f config/binary_rootfs/squashfs.sort ]
-		then
-			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -sort squashfs.sort"
-			cp config/binary_rootfs/squashfs.sort chroot #FIXME
-		fi
-
-		case "${LH_BUILD_WITH_CHROOT}" in
-			true)
-				# Create image
-				Chroot chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}"
-
-				case "${LH_MODE}" in
-					ubuntu)
-						du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
-						;;
-				esac
-
-				# Move image
-				${LH_ROOT_COMMAND} mv chroot/filesystem.squashfs binary/${INITFS}
-				${LH_ROOT_COMMAND} rm -f chroot/squashfs.sort
-
-				if [ -e chroot/chroot.cache ]
-				then
-					rm -f .lock
-					mv chroot/chroot chroot.tmp
-
-					lh chroot_linux-image remove ${*}
-					lh chroot_sources remove ${*}
-					lh chroot_apt remove ${*}
-					lh chroot_hostname remove ${*}
-					lh chroot_resolv remove ${*}
-					lh chroot_hosts remove ${*}
-					lh chroot_sysv-rc remove ${*}
-					lh chroot_upstart remove ${*}
-					lh chroot_dpkg remove ${*}
-					lh chroot_debianchroot remove ${*}
-					lh chroot_sysfs remove ${*}
-					lh chroot_selinuxfs remove ${*}
-					lh chroot_proc remove ${*}
-					lh chroot_devpts remove ${*}
-
-					rm -rf chroot
-					mv chroot.tmp chroot
-
-					lh chroot_devpts install ${*}
-					lh chroot_proc install ${*}
-					lh chroot_selinuxfs install ${*}
-					lh chroot_sysfs install ${*}
-					lh chroot_debianchroot install ${*}
-					lh chroot_dpkg install ${*}
-					lh chroot_sysv-rc install ${*}
-					lh chroot_upstart install ${*}
-					lh chroot_hosts install ${*}
-					lh chroot_resolv install ${*}
-					lh chroot_hostname install ${*}
-					lh chroot_apt install ${*}
-					lh chroot_sources install ${*}
-					lh chroot_linux-image install ${*}
-
-					touch .lock
-				else
-					rm -rf chroot/chroot
-
-					# Removing depends
-					Remove_package
-				fi
-
-				${LH_ROOT_COMMAND} chmod 0644 binary/${INITFS}/filesystem.squashfs
-				;;
-
-			false)
-				mksquashfs chroot binary/${INITFS}/filesystem.squashfs ${MKSQUASHFS_OPTIONS}
-
-				case "${LH_MODE}" in
-					ubuntu)
-						du -B 1 -s chroot | cut -f1 > binary/${INITFS}/filesystem.size
-						;;
-				esac
-				;;
-		esac
-
-		if [ -n "${LH_ROOT_COMMAND}" ]
-		then
-			${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) binary/${INITFS}
-		fi
-
-		# Saving cache
-		Save_cache cache/packages_binary
-		;;
-
-	none)
-		if [ -d binary ]
-		then
-			rm -rf binary
-		fi
-
-		case "${LH_BUILD_WITH_CHROOT}" in
-			true)
-				mv chroot/chroot binary
-				;;
-
-			false)
-				Echo_message "This may take a while."
-				cp -a chroot binary
-				;;
-		esac
-		;;
-
-esac
-
-for STAGE in ${LH_CACHE_STAGES}
-do
-	if [ "${STAGE}" = "rootfs" ]
-	then
-		rm -rf cache/stages_rootfs
-
-		mkdir -p cache/stages_rootfs
-
-		if [ "${LH_CHROOT_FILESYSTEM}" != "none" ]
-		then
-			${LH_ROOT_COMMAND} cp -a binary/"${INITFS}"/filesystem.* cache/stages_rootfs
-		fi
-
-		if [ -n "${LH_ROOT_COMMAND}" ]
-		then
-			${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) cache/stages_rootfs
-		fi
-	fi
-done
-
-# Creating stage file
-Create_stagefile .stage/binary_rootfs
diff --git a/helpers/binary_silo b/helpers/binary_silo
deleted file mode 100755
index c3f8b06..0000000
--- a/helpers/binary_silo
+++ /dev/null
@@ -1,272 +0,0 @@
-#!/bin/sh
-
-# lh_binary_silo(1) - installs silo into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'installs silo into binary')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_BOOTLOADER}" != "silo" ]
-then
-	exit 0
-fi
-
-# Check image type
-case "${LH_BINARY_IMAGES}" in
-	iso*|usb*|tar)
-		;;
-
-	net)
-		# silo not required for sparc netbooting
-		exit 0
-		;;
-esac
-
-Echo_message "Begin installing silo..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_silo
-
-# Checking silo templates
-Check_templates silo
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Check architecture
-Check_architecture sparc
-
-# Checking depends
-Check_package chroot/usr/sbin/silo silo
-
-# Restoring cache
-Restore_cache cache/packages_binary
-
-# Installing depends
-Install_package
-
-# Local functions
-Silo_live_entry ()
-{
-	LABEL="${1}"
-	KERNEL="${2}"
-	INITRD="${3}"
-	APPEND="${4}"
-
-	DIRECTORY="/$(basename ${DESTDIR_LIVE})"
-
-	LINUX_LIVE="${LINUX_LIVE}\nimage=${DIRECTORY}/${KERNEL}\n"
-	LINUX_LIVE="${LINUX_LIVE}\t  label=${LABEL}\n"
-	LINUX_LIVE="${LINUX_LIVE}\t  initrd=${DIRECTORY}/${INITRD}\n"
-	LINUX_LIVE="${LINUX_LIVE}\t  append=\"boot=${INITFS} live-config LH_BOOTAPPEND_LIVE ${APPEND}\"\n"
-}
-
-Silo_install_entry ()
-{
-	LABEL="${1}"
-	KERNEL="${2}"
-	INITRD="${3}"
-	APPEND="${4}"
-
-	DIRECTORY="/$(basename ${DESTDIR_INSTALL})"
-
-	if [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
-	then
-		APPEND="${APPEND} quiet"
-	fi
-
-	LINUX_INSTALL="${LINUX_INSTALL}\nimage=${DIRECTORY}/${KERNEL}\n"
-	LINUX_INSTALL="${LINUX_INSTALL}\t  label=${LABEL}\n"
-	LINUX_INSTALL="${LINUX_INSTALL}\t  initrd=${DIRECTORY}/${INITRD}\n"
-	LINUX_INSTALL="${LINUX_INSTALL}\t  append=\"LH_BOOTAPPEND_LIVE ${APPEND} LH_BOOTAPPEND_INSTALL\"\n"
-}
-
-# Setting destination directories
-DESTDIR_INSTALL="binary/install"
-case "${LH_INITRAMFS}" in
-	casper)
-		INITFS="casper"
-		DESTDIR_LIVE="binary/casper"
-		;;
-
-	live-initramfs)
-		INITFS="live"
-		DESTDIR_LIVE="binary/live"
-		;;
-esac
-
-# Creating directory
-mkdir -p "${DESTDIR_LIVE}"
-
-# Setting boot parameters
-case "${LH_ENCRYPTION}" in
-	""|false)
-		;;
-	*)
-		LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
-		;;
-esac
-
-if [ -n "${LH_USERNAME}" ]
-then
-	case "${LH_INITRAMFS}" in
-		casper)
-			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
-			;;
-
-		live-initramfs)
-			if [ "${LH_USERNAME}" != "user" ]
-			then
-				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
-			fi
-			;;
-	esac
-fi
-
-if [ -n "${LH_HOSTNAME}" ]
-then
-	case "${LH_INITRAMFS}" in
-		casper)
-			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
-			;;
-
-		live-initramfs)
-			if [ "${LH_HOSTNAME}" != "debian" ]
-			then
-				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
-			fi
-			;;
-	esac
-fi
-
-if [ "${LH_UNION_FILESYSTEM}" != "aufs" ]
-then
-	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}"
-fi
-
-if [ -n "${LH_NET_COW_PATH}" ]
-then
-	Echo_error "Net cow not supported on silo"
-	exit 1
-fi
-
-if [ "${LH_EXPOSED_ROOT}" != "false" ]
-then
-	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot"
-fi
-
-LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's|  ||')"
-
-# Parameters are listed at: linux/Documentation/kernel-parameters.txt
-FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=ofonly"
-
-# Assembling kernel configuration
-
-# Default entries
-DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
-DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
-DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')"
-
-Silo_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
-Silo_live_entry "live-failsafe" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${FAILSAFE}"
-
-if [ "$(echo ${LH_LINUX_FLAVOURS} | wc -w)" -gt "1" ]
-then
-	for KERNEL in chroot/boot/vmlinuz-*
-	do
-		KERNEL_IMAGE="$(basename ${KERNEL})"
-		KERNEL_VERSION="$(echo ${KERNEL_IMAGE} | sed -e 's|vmlinuz-||')"
-		INITRD="initrd.img-${KERNEL_VERSION}"
-
-		Silo_live_entry "live-${KERNEL_VERSION}" "${KERNEL_IMAGE}" "${INITRD}"
-		Silo_live_entry "live-${KERNEL_VERSION}-failsafe" "${KERNEL_IMAGE}" "${INITRD}" "${FAILSAFE}"
-	done
-fi
-
-LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')"
-
-# Assembling debian-installer configuration
-if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
-then
-	VMLINUZ_DI="vmlinuz"
-	INITRD_DI="initrd.gz"
-	APPEND_DI="vga=normal"
-
-	Silo_install_entry "linux" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
-	Silo_install_entry "install" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
-	Silo_install_entry "expert" "${VMLINUZ_DI}" "${INITRD_DI}" "priority=low ${APPEND_DI}"
-	Silo_install_entry "rescue" "${VMLINUZ_DI}" "${INITRD_DI}" "rescue/enable=true ${APPEND_DI}"
-	Silo_install_entry "auto" "${VMLINUZ_DI}" "${INITRD_DI}" "auto=true priority=critical ${APPEND_DI}"
-fi
-
-LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')"
-
-case "${LH_BINARY_IMAGES}" in
-	iso*|usb*)
-		# Copying silo
-		mkdir -p binary/boot
-
-		case "${LH_BUILD_WITH_CHROOT}" in
-			true)
-				cp chroot/boot/second.b binary/boot
-				;;
-
-			false)
-				cp /boot/second.b binary/boot
-				;;
-		esac
-
-		cp -r "${TEMPLATES}"/* binary/boot
-
-		if [ "${LH_DEBIAN_INSTALLER}" = "false" ]
-		then
-			rm -f binary/boot/debian.txt.install
-		else
-			mv binary/boot/debian.txt.install binary/boot/debian.txt
-		fi
-
-		# Configure silo templates
-		sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" \
-		       -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" \
-		       binary/boot/silo.conf
-		sed -i -e "s|LH_BOOTAPPEND_INSTALL|${LH_BOOTAPPEND_INSTALL}|" \
-		       -e "s|LH_BOOTAPPEND_LIVE|${LH_BOOTAPPEND_LIVE}|" \
-		       binary/boot/silo.conf
-		sed -i -e "s|LH_DATE|$(date +%Y%m%d)|" \
-		       -e "s|LH_VERSION|${VERSION}|" \
-		       -e "s|LH_DISTRIBUTION|${LH_DISTRIBUTION}|" \
-		       binary/boot/debian.txt
-		;;
-esac
-
-# Saving cache
-Save_cache cache/packages_binary
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_silo
diff --git a/helpers/binary_syslinux b/helpers/binary_syslinux
deleted file mode 100755
index 2553195..0000000
--- a/helpers/binary_syslinux
+++ /dev/null
@@ -1,659 +0,0 @@
-#!/bin/sh
-
-# lh_binary_syslinux(1) - installs syslinux into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'installs syslinux into binary')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_BOOTLOADER}" != "syslinux" ]
-then
-	exit 0
-fi
-
-Echo_message "Begin installing syslinux..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_syslinux
-
-# Checking syslinux templates
-Check_templates syslinux
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Check architecture
-Check_architecture amd64 i386
-Check_crossarchitecture
-
-# Checking depends
-Check_package chroot/usr/bin/syslinux syslinux
-
-# Restoring cache
-Restore_cache cache/packages_binary
-
-# Installing depends
-Install_package
-
-# Local functions
-Utf8_to_latin1 ()
-{
-	VALUE="${1}"
-
-	echo "${VALUE}" | iconv -f utf-8 -t latin1
-}
-
-Syslinux_memtest_entry ()
-{
-	LABEL="${1}"
-	MENULABEL="$(Utf8_to_latin1 "${2}")"
-	KERNEL="${3}"
-
-	MEMTEST="${MEMTEST}\nlabel ${LABEL}\n"
-
-	# Write the menu label if the syslinux menu is being use
-	MEMTEST="${MEMTEST}\tmenu label ${MENULABEL}\n"
-	MEMTEST="${MEMTEST}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n"
-	MEMTEST="$(/bin/echo ${MEMTEST} | sed -e 's|//|/|g')"
-}
-
-Syslinux_live_entry ()
-{
-	LABEL="${1}"
-	MENULABEL="$(Utf8_to_latin1 "${2}")"
-	MENULABEL="${2}"
-	KERNEL="${3}"
-	INITRD="${4}"
-	APPEND="${5}"
-
-	case "${LH_BINARY_IMAGES}" in
-		iso*|usb*)
-			NUMBER="$(ls -1 ${KERNEL_PATH} | grep 'vmlinuz[0-9]\+$' | wc -l)"
-			NUMBER="$((${NUMBER} +1))"
-
-			# Do not add numbering to filenames if first kernel/initrd
-			if [ "${NUMBER}" = "1" ]
-			then
-				NUMBER=""
-			fi
-
-			# Note: ISOLINUX will not find the kernel if the name ends in ".img".
-			if [ -e ${KERNEL_PATH}/${KERNEL} ]
-			then
-				mv ${KERNEL_PATH}/${KERNEL} ${KERNEL_PATH}/vmlinuz${NUMBER}
-			fi
-
-			if [ -e ${KERNEL_PATH}/${INITRD} ]
-			then
-				mv ${KERNEL_PATH}/${INITRD} ${KERNEL_PATH}/initrd${NUMBER}.img
-			fi
-
-			KERNEL=vmlinuz${NUMBER}
-			INITRD=initrd${NUMBER}.img
-		;;
-	esac
-
-	# Regular kernel
-	LINUX_LIVE="${LINUX_LIVE}\nlabel ${LABEL}\n"
-
-	# Write the menu label if the syslinux menu is being use
-	if [ -n "${MENULABEL}" ]
-	then
-		LINUX_LIVE="${LINUX_LIVE}\tmenu label ${MENULABEL}\n"
-	fi
-
-	LINUX_LIVE="${LINUX_LIVE}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n"
-	LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} live-config ${LH_BOOTAPPEND_LIVE} ${APPEND}\n"
-
-	# Failsafe kernel
-	LINUX_LIVE="${LINUX_LIVE}\nlabel ${LABEL}failsafe\n"
-
-	# Write the menu label if the syslinux menu is being use
-	if [ -n "${MENULABEL}" ]
-	then
-		LINUX_LIVE="${LINUX_LIVE}\tmenu label ${MENULABEL} (failsafe)\n"
-	fi
-
-	LINUX_LIVE="${LINUX_LIVE}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n"
-	LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} live-config ${LH_BOOTAPPEND_LIVE} ${APPEND} ${FAILSAFE}\n"
-}
-
-Syslinux_install_entry ()
-{
-	LABEL="${1}"
-	KERNEL="${2}"
-	INITRD="${3}"
-	APPEND="${4}"
-
-	# Boot in quiet mode where appropriate
-	QAPPEND="quiet"
-
-	for TYPE in Install Expert Rescue Auto
-	do
-		case "${TYPE}" in
-			Install)
-				TAPPEND="${APPEND} ${QAPPEND}"
-				;;
-
-			Expert)
-				TAPPEND="priority=low ${APPEND}"
-				;;
-
-			Rescue)
-				TAPPEND="rescue/enable=true ${APPEND} ${QAPPEND}"
-				;;
-
-			Auto)
-				TAPPEND="auto=true priority=critical ${APPEND} ${QAPPEND}"
-				;;
-		esac
-
-		case "${LABEL}" in
-			Text)
-				TYPE_SUFFIX=""
-				;;
-			GUI)
-				TYPE_SUFFIX="gui"
-				;;
-		esac
-
-		LINUX_INSTALL="${LINUX_INSTALL}\nlabel $(echo "${TYPE}" | tr A-Z a-z)${TYPE_SUFFIX}\n"
-		LINUX_INSTALL="${LINUX_INSTALL}\tmenu label ${LABEL} ${TYPE}\n"
-		LINUX_INSTALL="${LINUX_INSTALL}\tkernel ${LIVE_INSTALL_KERNEL_PATH}/${KERNEL}\n"
-		LINUX_INSTALL="${LINUX_INSTALL}\tappend initrd=${LIVE_INSTALL_KERNEL_PATH}/${INITRD} ${TAPPEND} ${LH_BOOTAPPEND_INSTALL}\n"
-	done
-}
-
-Copy_syslinux_templates ()
-{
-	cp -r "${TEMPLATES}"/common/* ${SCREEN_PATH}
-
-	if [ "${LH_SYSLINUX_MENU}" = "false" ]
-	then
-		cp "${TEMPLATES}"/normal/* ${SCREEN_PATH}
-	else
-		cp "${TEMPLATES}"/menu/* ${SCREEN_PATH}
-
-		case "${LH_SYSLINUX_MENU}" in
-			gfxboot)
-				MENUMODULE="gfxboot.c32"
-				;;
-
-			menu)
-				MENUMODULE="menu.c32"
-				;;
-
-			vesamenu)
-				MENUMODULE="vesamenu.c32"
-				;;
-
-			*)
-				if [ -z "${LH_SYSLINUX_CFG}" ]
-				then
-					MENUMODULE=$(grep 'menu.c32' ${TEMPLATES}/menu/syslinux.cfg | sed 's|default\s*.*/\(.*menu.c32\)$|\1|g')
-				else
-					LH_SYSLINUX_CFG="${LH_SYSLINUX_CFG:-${TEMPLATES}/menu/syslinux.cfg}"
-				fi
-				;;
-		esac
-
-		case "${LH_BUILD_WITH_CHROOT}" in
-			true)
-				cp chroot/usr/lib/syslinux/"${MENUMODULE}" ${DATA_PATH}
-				;;
-			false)
-				cp /usr/lib/syslinux/"${MENUMODULE}" ${DATA_PATH}
-				;;
-		esac
-	fi
-
-	if ls "${TEMPLATES}/${LH_LANGUAGE}"/* > /dev/null 2>&1
-	then
-		cp -r "${TEMPLATES}"/"${LH_LANGUAGE}"/* ${SCREEN_PATH}
-	else
-		if ls "${TEMPLATES}"/en/* > /dev/null 2>&1
-		then
-			cp -r "${TEMPLATES}"/en/* ${SCREEN_PATH}
-		fi
-	fi
-
-	if ls ${SCREEN_PATH}/*.live > /dev/null 2>&1
-	then
-		for FILE in ${SCREEN_PATH}/*.live
-		do
-			mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .live)
-		done
-	fi
-
-	if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
-	then
-		if ls ${SCREEN_PATH}/*.install > /dev/null 2>&1
-		then
-			for FILE in ${SCREEN_PATH}/*.install
-			do
-				mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .install)
-			done
-		fi
-
-		case "${LH_ARCHITECTURE}" in
-			amd64|i386|powerpc)
-				if ls ${SCREEN_PATH}/*.install.g-i > /dev/null 2>&1
-				then
-					for FILE in ${SCREEN_PATH}/*.install.g-i
-					do
-						mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .install.g-i)
-					done
-				fi
-				;;
-
-			*)
-				rm -f ${SCREEN_PATH}/*.install.g-i
-				;;
-		esac
-	else
-		rm -f ${SCREEN_PATH}/*.install*
-	fi
-
-	if [ "${LH_SYSLINUX_MENU}" != "false" ]
-	then
-		rm -f ${DATA_PATH}/boot.txt
-	fi
-
-	# Copying custom splash screen
-	if [ "${LH_SYSLINUX_SPLASH}" = "none" ]
-	then
-		# no splash screen
-		SPLASH=""
-		rm -f ${SCREEN_PATH}/splash.rle
-		rm -f ${DATA_PATH}/splash.png
-	else
-		if [ "${LH_SYSLINUX_MENU}" = "false" ]
-		then
-			SPLASH="${LIVE_DATA_PATH}/splash.rle"
-		else
-			SPLASH="${LIVE_DATA_PATH}/splash.png"
-		fi
-
-		if [ -n "${LH_SYSLINUX_SPLASH}" ]
-		then
-			if [ ! -e "${LH_SYSLINUX_SPLASH}" ]
-			then
-				Echo_error "%s doen't exist" "${LH_SYSLINUX_SPLASH}"
-				exit 1
-			else
-				rm -f ${SCREEN_PATH}/splash.rle
-				rm -f ${DATA_PATH}/splash.png
-				cp -f "${LH_SYSLINUX_SPLASH}" ${DATA_PATH}/$(basename ${SPLASH})
-			fi
-		fi
-	fi
-}
-
-Configure_syslinux_templates ()
-{
-	templates="$(find ${SYSLINUX_PATH} -type f -name '*.cfg' -o -name '*.txt')"
-
-	for template_file in ${templates}
-	do
-		sed -i -e "s|{\$LINUX_LIVE}|${LINUX_LIVE}|" \
-		       -e "s|{\$LINUX_INSTALL}|${LINUX_INSTALL}|" \
-		       -e "s|{\$MEMTEST}|${MEMTEST}|" \
-		       -e "s|{\$LIVE_SCREEN_PATH}|${LIVE_SCREEN_PATH}|" \
-		       -e "s|{\$LIVE_DATA_PATH}|${LIVE_DATA_PATH}|" \
-		       -e "s|{\$LIVE_KERNEL_PATH}|${LIVE_KERNEL_PATH}|" \
-		       -e "s|{\$SPLASH}|${SPLASH}|" \
-		       -e "s|{\$LH_DISTRIBUTION}|${LH_DISTRIBUTION}|" \
-		       -e "s|{\$LH_DATE}|$(date +%Y%m%d)|" \
-		       -e "s|{\$LH_MEDIA}|${MEDIA}|" \
-		       -e "s|{\$LH_VERSION}|${VERSION}|" \
-		       -e "s|{\$LH_SYSLINUX_TIMEOUT}|${LH_SYSLINUX_TIMEOUT}0|" \
-		$template_file
-	done
-
-	case "${LH_BINARY_IMAGES}" in
-		usb*)
-			if [ -f "${SYSLINUX_PATH}/exithelp.cfg" ]
-			then
-				sed -i -e "s|config isolinux.cfg|config syslinux.cfg|" "${SYSLINUX_PATH}"/exithelp.cfg
-			fi
-			;;
-
-		net)
-			if [ -f "${SCREEN_PATH}/exithelp.cfg" ]
-			then
-				sed -i -e "s|config isolinux.cfg|config ${LIVE_KERNEL_PATH}/pxelinux.cfg/default|" "${SCREEN_PATH}"/exithelp.cfg
-			fi
-			;;
-	esac
-}
-
-# Setting up common variables
-case "${LH_INITRAMFS}" in
-	casper)
-		INITFS="casper"
-		;;
-
-	live-initramfs)
-		INITFS="live"
-		;;
-esac
-
-# Setting boot method specific variables
-case "${LH_BINARY_IMAGES}" in
-	iso*)
-		SYSLINUX_PATH="binary/isolinux"
-		KERNEL_PATH="binary/${INITFS}"
-		SCREEN_PATH="${SYSLINUX_PATH}"
-		DATA_PATH="${SCREEN_PATH}"
-		LIVE_KERNEL_PATH="/${INITFS}"
-		LIVE_INSTALL_KERNEL_PATH="/install"
-		LIVE_SCREEN_PATH="/isolinux"
-		LIVE_DATA_PATH="${LIVE_SCREEN_PATH}"
-		MEDIA="CD-ROM"
-		;;
-
-	net)
-		SYSLINUX_PATH="tftpboot"
-		KERNEL_PATH="${SYSLINUX_PATH}/debian-live/${LH_ARCHITECTURE}"
-		SCREEN_PATH="${SYSLINUX_PATH}/debian-live/${LH_ARCHITECTURE}/boot-screens"
-		DATA_PATH="${SCREEN_PATH}"
-		LIVE_KERNEL_PATH="debian-live/${LH_ARCHITECTURE}"
-		LIVE_INSTALL_KERNEL_PATH="debian-install/${LH_ARCHITECTURE}"
-		LIVE_SCREEN_PATH="debian-live/${LH_ARCHITECTURE}/boot-screens"
-		LIVE_DATA_PATH="${LIVE_SCREEN_PATH}"
-		MEDIA="netboot"
-		;;
-
-	usb*|tar)
-		SYSLINUX_PATH="binary/syslinux"
-		KERNEL_PATH="binary/${INITFS}"
-		SCREEN_PATH="${SYSLINUX_PATH}"
-		DATA_PATH="${SCREEN_PATH}"
-		LIVE_KERNEL_PATH="/${INITFS}"
-		LIVE_INSTALL_KERNEL_PATH="/install"
-		LIVE_SCREEN_PATH="/syslinux"
-		LIVE_DATA_PATH="${LIVE_SCREEN_PATH}"
-		MEDIA="hd-media"
-		;;
-esac
-
-Check_multiarchitecture
-
-# Creating directories
-mkdir -p "${KERNEL_PATH}"
-mkdir -p "${SCREEN_PATH}"
-mkdir -p "${DATA_PATH}"
-
-# Setting boot parameters
-case "${LH_ENCRYPTION}" in
-	""|false)
-		;;
-	*)
-		LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
-		;;
-esac
-
-if [ -n "${LH_USERNAME}" ]
-then
-	case "${LH_INITRAMFS}" in
-		casper)
-			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
-			;;
-
-		live-initramfs)
-			if [ "${LH_USERNAME}" != "user" ]
-			then
-				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
-			fi
-			;;
-	esac
-fi
-
-if [ -n "${LH_HOSTNAME}" ]
-then
-	case "${LH_INITRAMFS}" in
-		casper)
-			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
-			;;
-
-		live-initramfs)
-			if [ "${LH_HOSTNAME}" != "debian" ]
-			then
-				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
-			fi
-			;;
-	esac
-fi
-
-if [ "${LH_UNION_FILESYSTEM}" != "aufs" ]
-then
-	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}"
-fi
-
-if [ "${LH_EXPOSED_ROOT}" != "false" ]
-then
-	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot"
-fi
-
-if [ "${LH_BINARY_IMAGES}" = "net" ]
-then
-	case "${LH_NET_ROOT_FILESYSTEM}" in
-		nfs)
-			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} netboot=nfs nfsroot=${LH_NET_ROOT_SERVER}:${LH_NET_ROOT_PATH}"
-			;;
-
-		cifs)
-			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} netboot=cifs nfsroot=//${LH_NET_ROOT_SERVER}${LH_NET_ROOT_PATH}"
-			;;
-
-		*)
-			Echo_error "Unsupported net filesystem"
-			exit 1
-			;;
-	esac
-
-	if [ -n "${LH_NET_ROOT_MOUNTOPTIONS}" ]
-	then
-		LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} nfsopts=${LH_NET_ROOT_MOUNTOPTIONS}"
-	fi
-fi
-
-if [ -n "${LH_NET_COW_PATH}" ]
-then
-	case "${LH_NET_COW_FILESYSTEM}" in
-		nfs)
-			if [ -n "${LH_NET_COW_MOUNTOPTIONS}" ]
-			then
-				LH_NET_COW_MOUNTOPTIONS=",${LH_NET_COW_MOUNTOPTIONS}"
-			fi
-
-			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} nfscow=${LH_NET_COW_SERVER}:${LH_NET_COW_PATH}${LH_NET_COW_MOUNTOPTIONS}"
-			;;
-
-		*)
-			Echo_error "Unsupported net filesystem"
-			exit 1
-			;;
-	esac
-fi
-
-LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's|  ||')"
-
-# Parameters are listed at: linux/Documentation/kernel-parameters.txt
-FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal"
-
-# Moving kernels into place
-if [ "binary/${INITFS}" != "${KERNEL_PATH}" ]
-then
-	mv binary/${INITFS}/vmlinuz* ${KERNEL_PATH}
-	mv binary/${INITFS}/initrd* ${KERNEL_PATH}
-
-	if [ "${LH_MEMTEST}" != "false" ] && [ "${LH_MEMTEST}" != "none" ]
-	then
-		mv binary/${INITFS}/memtest ${KERNEL_PATH}
-	fi
-fi
-
-# Default entries
-DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
-DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
-DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')"
-
-Syslinux_live_entry "live" "${LH_SYSLINUX_MENU_LIVE_ENTRY}" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
-
-if [ "$(echo ${LH_LINUX_FLAVOURS} | wc -w)" -gt "1" ]
-then
-	for FLAVOUR in ${LH_LINUX_FLAVOURS}
-	do
-		if [ "${FLAVOUR}" != "${DEFAULT_FLAVOUR}" ]
-		then
-			FLAVOUR_KERNEL="$(basename chroot/boot/vmlinuz-*${FLAVOUR})"
-			FLAVOUR_INITRD="initrd.img-$(echo ${FLAVOUR_KERNEL} | sed -e 's|vmlinuz-||')"
-			Syslinux_live_entry "live-${FLAVOUR}" "${LH_SYSLINUX_MENU_LIVE_ENTRY} ${FLAVOUR}" "${FLAVOUR_KERNEL}" "${FLAVOUR_INITRD}"
-		fi
-	done
-fi
-
-# Only needed for non-vesamenu, non-gfxboot syslinux
-case "${LH_SYSLINUX_MENU}" in
-	false|menu)
-		# Adding syslinux hardcoded default label entry
-		Syslinux_live_entry "linux" "" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
-		;;
-esac
-
-# Assembling debian-installer configuration
-if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
-then
-	VMLINUZ_DI="vmlinuz"
-	INITRD_DI="initrd.gz"
-	APPEND_DI="vga=normal"
-
-	VMLINUZ_GI="gtk/vmlinuz"
-	INITRD_GI="gtk/initrd.gz"
-	APPEND_GI="video=vesa:ywrap,mtrr vga=788"
-
-	if [ -f "binary/${LIVE_INSTALL_KERNEL_PATH}/${VMLINUZ_DI}" ] && [ -f "binary/${LIVE_INSTALL_KERNEL_PATH}/${INITRD_DI}" ]
-	then
-		Syslinux_install_entry "Text" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
-	fi
-
-	if [ -f "binary/${LIVE_INSTALL_KERNEL_PATH}/${VMLINUZ_GI}" ] && [ -f "binary/${LIVE_INSTALL_KERNEL_PATH}/${INITRD_GI}" ]
-	then
-		Syslinux_install_entry "GUI" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}"
-	fi
-fi
-
-# Assembling memtest configuration
-if [ -f "${KERNEL_PATH}"/memtest ]
-then
-	Syslinux_memtest_entry "memtest" "${LH_SYSLINUX_MENU_MEMTEST_ENTRY}" "memtest"
-fi
-
-# Copy templates to base syslinux directory
-Copy_syslinux_templates
-
-# Fill in templates with created values
-Configure_syslinux_templates
-
-# Configure syslinux setup per boot method
-case "${LH_BINARY_IMAGES}" in
-	iso*)
-		case "${LH_BUILD_WITH_CHROOT}" in
-			true)
-				cp chroot/usr/lib/syslinux/isolinux.bin ${SCREEN_PATH}
-				;;
-			false)
-				cp /usr/lib/syslinux/isolinux.bin ${SCREEN_PATH}
-				;;
-		esac
-
-		mv ${SCREEN_PATH}/syslinux.cfg ${SCREEN_PATH}/isolinux.cfg
-
-		# Copying configuration file
-		if [ -n "${LH_SYSLINUX_CFG}" ]
-		then
-			cp "${LH_SYSLINUX_CFG}" ${SCREEN_PATH}/isolinux.cfg
-		fi
-		;;
-
-	net)
-		case "${LH_BUILD_WITH_CHROOT}" in
-			true)
-				cp chroot/usr/lib/syslinux/pxelinux.0 ${KERNEL_PATH}
-				;;
-			false)
-				cp /usr/lib/syslinux/pxelinux.0 ${KERNEL_PATH}
-				;;
-		esac
-
-		mkdir -p ${KERNEL_PATH}/pxelinux.cfg
-		ln -s ${LIVE_KERNEL_PATH}/pxelinux.cfg ${SYSLINUX_PATH}/pxelinux.cfg
-		ln -s ${LIVE_KERNEL_PATH}/pxelinux.0 ${SYSLINUX_PATH}/pxelinux.0
-
-		# Adjusting include pathes
-		for FILE in ${SCREEN_PATH}/*.cfg
-		do
-			sed -i -e "s|^include |include ${LIVE_SCREEN_PATH}/|g" "${FILE}"
-		done
-
-		sed -i -e "s| f| ${LIVE_SCREEN_PATH}/f|g" ${SCREEN_PATH}/prompt.cfg
-
-		mv ${SCREEN_PATH}/syslinux.cfg ${KERNEL_PATH}/pxelinux.cfg/default
-
-		# Copying configuration file
-		if [ -n "${LH_SYSLINUX_CFG}" ]
-		then
-			cp "${LH_SYSLINUX_CFG}" ${KERNEL_PATH}/pxelinux.cfg/default
-		fi
-		;;
-
-	usb*|tar)
-		case "${LH_BUILD_WITH_CHROOT}" in
-			true)
-				cp chroot/usr/lib/syslinux/isolinux.bin ${SCREEN_PATH}/syslinux.bin
-				;;
-			false)
-				cp /usr/lib/syslinux/isolinux.bin ${SCREEN_PATH}/syslinux.bin
-				;;
-		esac
-
-		# Copying configuration file
-		if [ -n "${LH_SYSLINUX_CFG}" ]
-		then
-			cp "${LH_SYSLINUX_CFG}" ${SCREEN_PATH}/syslinux.cfg
-		fi
-		;;
-esac
-
-# Saving cache
-Save_cache cache/packages_binary
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_syslinux
diff --git a/helpers/binary_tar b/helpers/binary_tar
deleted file mode 100755
index 082f969..0000000
--- a/helpers/binary_tar
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-# lh_binary_tar(1) - build harddisk binary image
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'build harddisk binary image')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if ! In_list tar "${LH_BINARY_IMAGES}"
-then
-	exit 0
-fi
-
-Echo_message "Begin building binary harddisk image..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_tar
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old binary
-rm -f binary.tar.gz
-
-tar cf binary-tar.tar binary
-gzip ${GZIP_OPTIONS} binary-tar.tar
-
-# Creating stage file
-Create_stagefile .stage/binary_tar
diff --git a/helpers/binary_usb b/helpers/binary_usb
deleted file mode 100755
index 7d84305..0000000
--- a/helpers/binary_usb
+++ /dev/null
@@ -1,280 +0,0 @@
-#!/bin/sh
-
-# lh_binary_usb(1) - build binary usb image
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'build binary image')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if ! In_list usb-hdd "${LH_BINARY_IMAGES}"
-then
-	exit 0
-fi
-
-Echo_message "Begin building binary usb image..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap .stage/chroot_proc
-
-# Checking stage file
-Check_stagefile .stage/binary_usb
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Checking depends
-Check_package chroot/sbin/mkdosfs dosfstools
-Check_package chroot/usr/share/doc/mtools mtools
-Check_package chroot/sbin/parted parted
-
-if [ "${LH_ARCHITECTURE}" = "sparc" ]
-then
-	case "${LH_BINARY_FILESYSTEM}" in
-		ext2|ext3)
-			Check_package chroot/sbin/mkfs.ext2 e2fsprogs
-			;;
-
-		*)
-			Echo_error "Sparc only supports booting from ext2, ext3 (or ufs)"
-			exit 1
-			;;
-	esac
-fi
-
-case "${LH_BOOTLOADER}" in
-	grub)
-		Check_package chroot/usr/sbin/grub grub
-		;;
-
-	syslinux)
-		Check_package chroot/usr/bin/syslinux syslinux
-		;;
-esac
-
-# Restoring cache
-Restore_cache cache/packages_binary
-
-# Installing depends
-Install_package
-
-# Remove old binary
-if [ -f binary.img ]
-then
-	rm -f binary.img
-fi
-
-# Enforce fat32 if we find individual files bigger than 2GB
-if [ "${LH_BINARY_FILESYSTEM}" = "fat16" ] && [ -n "$(find binary -size +1999M)" ]
-then
-	Echo_warning "FAT16 doesn't support files larger than 2GB, automatically enforcing FAT32."
-
-	LH_BINARY_FILESYSTEM="fat32"
-	export LH_BINARY_FILESYSTEM
-fi
-
-# Enforce fat32 if we have images in total bigger than 2GB
-if [ "${LH_BINARY_FILESYSTEM}" = "fat16" ] && [ "$(du -s binary | awk '{ print $1 }')" -gt "1900000" ]
-then
-	Echo_warning "FAT16 doesn't support partitions larger than 2GB, automatically enforcing FAT32"
-
-	LH_BINARY_FILESYSTEM="fat32"
-	export LH_BINARY_FILESYSTEM
-fi
-
-# Everything which comes here needs to be cleaned up,
-DU_DIM="$(du -ms binary | cut -f1)"
-REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LH_BINARY_FILESYSTEM})"
-dd if=/dev/zero of=chroot/binary.img bs=1024k count=0 seek=${REAL_DIM}
-FREELO="$(${LH_LOSETUP} -f)"
-if [ ! -b chroot/${FREELO} ]
-then
-	MAKEDEV="true"
-
-	mv chroot/dev chroot/dev.tmp
-	find /dev | cpio -dmpu chroot
-fi
-
-echo "!!! The following error/warning messages can be ignored !!!"
-Losetup $FREELO chroot/binary.img 0
-
-case "${LH_ARCHITECTURE}" in
-	sparc)
-		PARTITION_TABLE_TYPE="sun"
-		;;
-	*)
-		PARTITION_TABLE_TYPE="msdos"
-		;;
-esac
-
-case "${LH_BINARY_FILESYSTEM}" in
-	ext2|ext3)
-		PARTITION_TYPE="ext2"
-		;;
-
-	fat16|fat32)
-		PARTITION_TYPE="${LH_BINARY_FILESYSTEM}"
-		;;
-
-	*)
-		Echo_error "Unsupported binary filesystem %s" "${LH_BINARY_FILESYSTEM}"
-		exit 1
-		;;
-esac
-
-case "${LH_BUILD_WITH_CHROOT}" in
-	true)
-		Chroot chroot "parted -s ${FREELO} mklabel ${PARTITION_TABLE_TYPE}" || true
-		Chroot chroot "parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100%" || true
-		Chroot chroot "parted -s ${FREELO} set 1 boot on" || true
-		Chroot chroot "parted -s ${FREELO} set 1 lba off" || true
-
-		if [ "${LH_BOOTLOADER}" = "syslinux" ]
-		then
-			dd if=chroot/usr/lib/syslinux/mbr.bin of=${FREELO} bs=440 count=1
-		fi
-		;;
-
-	false)
-		parted -s ${FREELO} mklabel ${PARTITION_TABLE_TYPE} || true
-		parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100% || true
-		parted -s ${FREELO} set 1 boot on || true
-		parted -s ${FREELO} set 1 lba off || true
-
-		if [ "${LH_BOOTLOADER}" = "syslinux" ]
-		then
-			dd if=/usr/lib/syslinux/mbr.bin of=${FREELO} bs=440 count=1
-		fi
-		;;
-esac
-
-sleep 1
-${LH_LOSETUP} -d ${FREELO}
-
-FREELO="$(${LH_LOSETUP} -f)"
-Losetup $FREELO chroot/binary.img 1
-
-case "${LH_BINARY_FILESYSTEM}" in
-	ext2|ext3)
-		MKFS="${LH_BINARY_FILESYSTEM}"
-		MKFS_OPTIONS="-L DEBIAN_LIVE -m 0"
-		;;
-
-	fat16)
-		MKFS="vfat"
-		MKFS_OPTIONS="-F 16 -n DEBIAN_LIVE"
-		;;
-
-	fat32)
-		MKFS="vfat"
-		MKFS_OPTIONS="-F 32 -n DEBIAN_LIVE"
-		;;
-esac
-
-case "${LH_BUILD_WITH_CHROOT}" in
-	true)
-		Chroot chroot "mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO}"
-		;;
-
-	false)
-		mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO}
-		;;
-esac
-
-case "${LH_BINARY_FILESYSTEM}" in
-	fat*)
-		CP_OPTIONS="-L"
-		;;
-esac
-
-mkdir -p chroot/binary.tmp
-${LH_ROOT_COMMAND} mount ${FREELO} chroot/binary.tmp
-cp -r -T ${CP_OPTIONS} binary/ chroot/binary.tmp
-
-FIXME()
-{
-if [ "${LH_BOOTLOADER}" = "grub" ]
-then
-
-cat > chroot/grub.sh << EOF
-cd binary.tmp
-grub --batch << EOM
-find /live/vmlinuz
-EOM
-EOF
-
-	rootpartition="$(Chroot chroot 'sh grub.sh' 2>/dev/null | grep -A 1 'find /live/vmlinuz' | grep -v 'find /live/vmlinuz')"
-	usbdev="$(echo $rootpartition | sed -e 's|,[[:digit:]]||')"
-	echo "Root partition is $rootpartition, device is: $usbdev"
-
-	echo "WAITING..." && read WAIT
-
-#cat > chroot/grub.sh << EOF
-#grub --batch << EOM
-#root $rootpartition
-#setup $usbdev
-#EOM
-#EOF
-
-#Chroot chroot "sh grub.sh"
-
-	rm -f chroot/grub.sh
-fi
-}
-
-${LH_ROOT_COMMAND} umount chroot/binary.tmp
-rmdir chroot/binary.tmp
-
-if [ "${LH_BOOTLOADER}" = "syslinux" ]
-then
-	case "${LH_BUILD_WITH_CHROOT}" in
-		true)
-			Chroot chroot "syslinux ${FREELO}"
-			;;
-
-		false)
-			syslinux ${FREELO}
-			;;
-	esac
-fi
-
-sleep 1
-${LH_LOSETUP} -d ${FREELO}
-
-echo "!!! The above error/warning messages can be ignored !!!"
-
-if [ -n "${MAKEDEV}" ]
-then
-	rm -rf chroot/dev
-	mv chroot/dev.tmp chroot/dev
-fi
-
-mv chroot/binary.img ./
-
-# Saving cache
-Save_cache cache/packages_binary
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_usb
diff --git a/helpers/binary_virtual-hdd b/helpers/binary_virtual-hdd
deleted file mode 100755
index 1cb9755..0000000
--- a/helpers/binary_virtual-hdd
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/sh
-
-# lh_binary_virtual-hdd(1) - build binary virtual-hdd image
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'build binary image')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if ! In_list virtual-hdd "${LH_BINARY_IMAGES}"
-then
-	exit 0
-fi
-
-Echo_message "Begin building binary virtual-hdd image..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap .stage/chroot_proc
-
-# Checking stage file
-Check_stagefile .stage/binary_virtual-hdd
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
-then
-	case "${LH_BINARY_FILESYSTEM}" in
-		ext2|ext3)
-			Check_package chroot/sbin/mkfs.ext2 e2fsprogs
-			;;
-	esac
-fi
-
-# Restoring cache
-Restore_cache cache/packages_binary
-
-# Installing depends
-Install_package
-
-# Remove old binary
-if [ -f binary-virtual.img ]
-then
-	rm -f binary-virtual.img
-fi
-
-Echo_message "Creating virtual disk image..."
-dd if=/dev/zero of=binary-virtual.img bs=1024k count=0 seek=${LH_VIRTUAL_ROOT_SIZE}
-
-if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
-then
-	mv binary-virtual.img chroot
-
-	# hack to recreate mtab from chroot_hacks if its gone for some reason
-	if ! Chroot chroot "test -s /etc/mtab"
-	then
-		Chroot chroot "rm -f /etc/mtab"
-		Chroot chroot "ln -s /proc/mounts /etc/mtab"
-	fi
-
-	case "${LH_BINARY_FILESYSTEM}" in
-		ext2)
-			Chroot chroot "mkfs.ext2 -F binary-virtual.img"
-			;;
-
-		ext3)
-			Chroot chroot "mkfs.ext3 -F binary-virtual.img"
-			;;
-	esac
-
-	mv chroot/binary-virtual.img ./
-else
-	case "${LH_BINARY_FILESYSTEM}" in
-		ext2)
-			mkfs.ext2 -F binary-virtual.img
-			;;
-
-		ext3)
-			mkfs.ext3 -F binary-virtual.img
-			;;
-	esac
-fi
-
-mkdir -p binary.tmp
-${LH_ROOT_COMMAND} mount -o loop binary-virtual.img binary.tmp
-cp -a binary/* binary.tmp
-cp -af binary/.disk* binary.tmp
-
-${LH_ROOT_COMMAND} umount binary.tmp
-rmdir binary.tmp
-
-# Saving cache
-Save_cache cache/packages_binary
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_virtual-hdd
diff --git a/helpers/binary_win32-loader b/helpers/binary_win32-loader
deleted file mode 100755
index 934e33c..0000000
--- a/helpers/binary_win32-loader
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/bin/sh
-
-# lh_binary_win32-loader(1) - copy win32-loader into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'copy win32-loader into binary')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_WIN32_LOADER}" != "true" ] || [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ]
-then
-	exit 0
-fi
-
-Echo_message "Begin copying win32-loader..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_win32-loader
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-case "${LH_ARCHITECTURE}" in
-	amd64|i386)
-		case "${LH_DISTRIBUTION}" in
-			lenny|squeeze)
-				WIN32_LOADER="/usr/lib/win32-loader"
-				;;
-
-			*)
-				WIN32_LOADER="/usr/share/win32"
-				;;
-		esac
-
-		if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
-		then
-			# Checking depends
-			Check_package chroot/${WIN32_LOADER}/win32-loader.exe win32-loader
-
-			# Restoring cache
-			Restore_cache cache/packages_binary
-
-			# Installing depends
-			Install_package
-
-			# Copying win32-loader
-			cp -r chroot/${WIN32_LOADER}/* binary
-		else
-			cp -r ${WIN32_LOADER}/* binary
-		fi
-
-		mv binary/win32-loader.exe binary/setup.exe
-
-		if [ -e binary/win32-loader-standalone.exe ]
-		then
-			mv binary/win32-loader-standalone.exe binary/setup-standalone.exe
-		fi
-
-		if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
-		then
-
-cat > binary/win32-loader.ini << EOF
-[installer]
-arch=${LH_ARCHITECTURE}
-i386/linux=install/vmlinuz
-i386/initrd=install/initrd.gz
-i386/gtk/linux=install/vmlinuz
-i386/gtk/initrd=install/gtk/initrd.gz
-
-[grub]
-g2ldr=g2ldr
-g2ldr.mbr=g2ldr.mbr
-EOF
-
-		fi
-
-		# Saving cache
-		Save_cache cache/packages_binary
-
-		# Removing depends
-		Remove_package
-		;;
-
-	*)
-		Echo_warning "win32-loader inclusion is set to true but not compatible with your architecture, ignoring."
-		;;
-esac
-
-# Creating stage file
-Create_stagefile .stage/binary_win32-loader
diff --git a/helpers/binary_yaboot b/helpers/binary_yaboot
deleted file mode 100755
index b660f5f..0000000
--- a/helpers/binary_yaboot
+++ /dev/null
@@ -1,314 +0,0 @@
-#!/bin/sh
-
-# lh_binary_yaboot(1) - installs yaboot into binary
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'installs yaboot into binary')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_BOOTLOADER}" != "yaboot" ]
-then
-	exit 0
-fi
-
-Echo_message "Begin installing yaboot..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_yaboot
-
-# Checking yaboot templates
-Check_templates yaboot
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Check architecture
-Check_architecture powerpc ppc64
-Check_crossarchitecture
-
-# Checking depends
-Check_package chroot/usr/lib/yaboot/yaboot yaboot
-
-# Restoring cache
-Restore_cache cache/packages_binary
-
-# Installing depends
-Install_package
-
-# Local functions
-Yaboot_live_entry ()
-{
-	LABEL="${1}"
-	KERNEL="${2}"
-	INITRD="${3}"
-	APPEND="${4}"
-
-	DIRECTORY="/$(basename ${DESTDIR_LIVE})"
-
-	LINUX_LIVE="${LINUX_LIVE}\nimage=${DIRECTORY}/${KERNEL}\n"
-	LINUX_LIVE="${LINUX_LIVE}\tlabel=${LABEL}\n"
-	LINUX_LIVE="${LINUX_LIVE}\tinitrd=${DIRECTORY}/${INITRD}\n"
-	LINUX_LIVE="${LINUX_LIVE}\tappend=\"boot=${INITFS} live-config LH_BOOTAPPEND_LIVE ${APPEND}\"\n"
-	LINUX_LIVE="${LINUX_LIVE}\tinitrd-size=10240\n"
-}
-
-Yaboot_install_entry ()
-{
-	LABEL="${1}"
-	KERNEL="${2}"
-	INITRD="${3}"
-	APPEND="${4}"
-
-	DIRECTORY="/$(basename ${DESTDIR_INSTALL})"
-
-	QAPPEND="quiet"
-
-	for TYPE in Install Expert Rescue Auto
-	do
-		case "${TYPE}" in
-			Install)
-				TAPPEND="${APPEND} ${QAPPEND}"
-				;;
-
-			Expert)
-				TAPPEND="priority=low ${APPEND}"
-				;;
-
-			Rescue)
-				TAPPEND="rescue/enable=true ${APPEND} ${QAPPEND}"
-				;;
-
-			Auto)
-				TAPPEND="auto=true priority=critical ${APPEND} ${QAPPEND}"
-				;;
-		esac
-
-		case "${LABEL}" in
-			Text)
-				TYPE_SUFFIX=""
-				;;
-			GUI)
-				TYPE_SUFFIX="gui"
-				;;
-		esac
-
-		LINUX_INSTALL="${LINUX_INSTALL}\nimage=${DIRECTORY}/${KERNEL}\n"
-		LINUX_INSTALL="${LINUX_INSTALL}\tlabel=${TYPE}${TYPE_SUFFIX}\n"
-		LINUX_INSTALL="${LINUX_INSTALL}\tinitrd=${DIRECTORY}/${INITRD}\n"
-		LINUX_INSTALL="${LINUX_INSTALL}\tappend=\"${TAPPEND} ${LH_BOOTAPPEND_INSTALL}\"\n"
-		LINUX_INSTALL="${LINUX_INSTALL}\tinitrd-size=10240\n"
-	done
-}
-
-case "${LH_INITRAMFS}" in
-	casper)
-		INITFS="casper"
-		;;
-
-	live-initramfs)
-		INITFS="live"
-		;;
-esac
-
-# Setting destination directory
-case "${LH_BINARY_IMAGES}" in
-	iso*)
-		case "${LH_INITRAMFS}" in
-			casper)
-				DESTDIR_LIVE="binary/casper"
-				;;
-
-			live-initramfs)
-				DESTDIR_LIVE="binary/live"
-				;;
-		esac
-
-		DESTDIR_INSTALL="binary/install"
-		;;
-
-	usb*|net|tar)
-		Echo_error "not yet supported, aborting (FIXME)."
-		exit 1
-	;;
-esac
-
-Check_multiarchitecture
-
-# Creating directory
-mkdir -p "${DESTDIR_LIVE}"
-
-# Setting boot parameters
-case "${LH_ENCRYPTION}" in
-	""|false)
-		;;
-	*)
-		LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
-		;;
-esac
-
-if [ -n "${LH_USERNAME}" ]
-then
-	case "${LH_INITRAMFS}" in
-		casper)
-			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
-			;;
-
-		live-initramfs)
-			if [ "${LH_USERNAME}" != "user" ]
-			then
-				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
-			fi
-			;;
-	esac
-fi
-
-if [ -n "${LH_HOSTNAME}" ]
-then
-	case "${LH_INITRAMFS}" in
-		casper)
-			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
-			;;
-
-		live-initramfs)
-			if [ "${LH_HOSTNAME}" != "debian" ]
-			then
-				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
-			fi
-			;;
-	esac
-fi
-
-if [ "${LH_UNION_FILESYSTEM}" != "aufs" ]
-then
-	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}"
-fi
-
-if [ -n "${LH_NET_COW_PATH}" ]
-then
-	Echo_error "Net cow not yet supported on yaboot"
-	exit 1
-fi
-
-if [ "${LH_EXPOSED_ROOT}" != "false" ]
-then
-	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot"
-fi
-
-LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's|  ||')"
-
-# Parameters are listed at: linux/Documentation/kernel-parameters.txt
-FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=ofonly"
-
-# Assembling kernel configuration
-
-# Default entries
-DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
-DEFAULT_KERNEL="$(basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR})"
-DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinux-||')"
-
-Yaboot_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
-Yaboot_live_entry "live-failsafe" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${FAILSAFE}"
-
-if [ "$(echo ${LH_LINUX_FLAVOURS} | wc -w)" -gt "1" ]
-then
-	for KERNEL in chroot/boot/vmlinux-*
-	do
-		KERNEL_IMAGE="$(basename ${KERNEL})"
-		KERNEL_VERSION="$(echo ${KERNEL_IMAGE} | sed -e 's|vmlinux-||')"
-		INITRD="initrd.img-${KERNEL_VERSION}"
-
-		Yaboot_live_entry "live-${KERNEL_VERSION}" "${KERNEL_IMAGE}" "${INITRD}"
-		Yaboot_live_entry "live-${KERNEL_VERSION}-failsafe" "${KERNEL_IMAGE}" "${INITRD}" "${FAILSAFE}"
-	done
-fi
-
-LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')"
-
-# Assembling debian-installer configuration
-if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
-then
-	VMLINUZ_DI="vmlinuz"
-	INITRD_DI="initrd.gz"
-	APPEND_DI="vga=normal"
-
-	VMLINUZ_GI="gtk/vmlinuz"
-	INITRD_GI="gtk/initrd.gz"
-	APPEND_GI="video=vesa:ywrap,mtrr vga=788"
-
-	if [ -f "binary/${DESTDIR_INSTALL}/${VMLINUZ_DI}" ] && [ -f "binary/${DESTDIR_INSTALL}/${INITRD_DI}" ]
-	then
-		Yaboot_install_entry "Text" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
-	fi
-
-	if [ -f "binary/${DESTDIR_INSTALL}/${VMLINUZ_GI}" ] && [ -f "binary/${DESTDIR_INSTALL}/${INITRD_GI}" ]
-	then
-		Yaboot_install_entry "GUI" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}"
-	fi
-fi
-
-LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')"
-
-case "${LH_BINARY_IMAGES}" in
-	iso*|usb*)
-		# Copying yaboot
-		mkdir -p binary/yaboot
-
-		case "${LH_BUILD_WITH_CHROOT}" in
-			true)
-				cp chroot/usr/lib/yaboot/yaboot binary/yaboot
-				;;
-
-			false)
-				cp /usr/lib/yaboot/yaboot binary/yaboot
-				;;
-		esac
-
-		cp -r "${TEMPLATES}"/* binary/yaboot
-
-		case "${LH_BINARY_IMAGES}" in
-			usb*)
-				mv binary/yaboot/yaboot.conf binary/yaboot/yaboot.conf.tmp
-				echo "root=/dev/ram" > binary/yaboot/yaboot.conf
-				cat binary/yaboot/yaboot.conf.tmp >> binary/yaboot/yaboot.conf
-				rm -f binary/yaboot/yaboot.conf.tmp
-				;;
-		esac
-
-		# Configure yaboot templates
-		sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" binary/yaboot/yaboot.conf
-		sed -i -e "s|LH_BOOTAPPEND_INSTALL|${LH_BOOTAPPEND_INSTALL}|" -e "s|LH_BOOTAPPEND_LIVE|${LH_BOOTAPPEND_LIVE}|" binary/yaboot/yaboot.conf
-		sed -i -e "s|LH_DATE|$(date +%Y%m%d)|" -e "s|LH_VERSION|${VERSION}|" binary/yaboot/boot.msg
-		;;
-esac
-
-# Saving cache
-Save_cache cache/packages_binary
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/binary_yaboot
diff --git a/helpers/bootstrap b/helpers/bootstrap
deleted file mode 100755
index fb890c4..0000000
--- a/helpers/bootstrap
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-# lh_bootstrap(1) - bootstrap a Debian system
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'bootstrap a Debian system')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Setup cleanup function
-Setup_cleanup
-
-# Bootstrapping system
-lh bootstrap_cache restore ${*}
-lh bootstrap_copy ${*}
-lh bootstrap_cdebootstrap ${*}
-lh bootstrap_debootstrap ${*}
-lh bootstrap_cache save ${*}
diff --git a/helpers/bootstrap_cache b/helpers/bootstrap_cache
deleted file mode 100755
index 26ef908..0000000
--- a/helpers/bootstrap_cache
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-
-# lh_bootstrap_cache(1) - cach bootstrap stage
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'cache bootstrap stage')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Check architecture
-Check_crossarchitecture
-
-Echo_message "Begin caching bootstrap stage..."
-
-for STAGE in ${LH_CACHE_STAGES}
-do
-	if [ "${STAGE}" = "bootstrap" ]
-	then
-		case "${1}" in
-			restore)
-				# Checking stage file
-				Check_stagefile .stage/bootstrap_cache.restore
-
-				if [ -d cache/stages_bootstrap ]
-				then
-					# Checking lock file
-					Check_lockfile .lock
-
-					# Creating lock file
-					Create_lockfile .lock
-
-					# Removing old chroot
-					rm -rf chroot
-
-					# Restoring old cache
-					${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot
-
-					if [ -n "${LH_ROOT_COMMAND}" ]
-					then
-						${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
-					fi
-
-					# Creating stage file
-					Create_stagefile .stage/bootstrap_cache.restore
-					Create_stagefile .stage/bootstrap
-
-					exit 0
-				fi
-				;;
-
-			save)
-				# Checking stage file
-				Check_stagefile .stage/bootstrap_cache.save
-
-				# Checking lock file
-				Check_lockfile .lock
-
-				# Creating lock file
-				Create_lockfile .lock
-
-				rm -rf cache/stages_bootstrap
-
-				mkdir -p cache
-
-				${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap
-
-				if [ -n "${LH_ROOT_COMMAND}" ]
-				then
-					${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) cache/stages_bootstrap
-				fi
-
-				# Creating stage file
-				Create_stagefile .stage/bootstrap_cache.save
-				;;
-		esac
-	fi
-done
diff --git a/helpers/bootstrap_cdebootstrap b/helpers/bootstrap_cdebootstrap
deleted file mode 100755
index 11f77d3..0000000
--- a/helpers/bootstrap_cdebootstrap
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/bin/sh
-
-# lh_bootstrap_cdebootstrap(1) - bootstrap a Debian system with cdebootstrap(1)
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'bootstrap a Debian system with cdebootstrap(1)')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_BOOTSTRAP}" != "cdebootstrap" ] && [ "${LH_BOOTSTRAP}" != "cdebootstrap-static" ]
-then
-	exit 0
-fi
-
-# Check architecture
-Check_crossarchitecture
-
-Echo_message "Begin bootstrapping system..."
-
-Check_package /usr/bin/${LH_BOOTSTRAP} cdebootstrap
-
-# Ensure that a system is built as root
-lh testroot
-
-# Checking stage file
-Check_stagefile .stage/bootstrap
-Check_stagefile .stage/bootstrap_cache.restore
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Creating chroot directory
-mkdir -p chroot
-
-# Setting cdebootstrap options
-if [ -n "${LH_ARCHITECTURE}" ]
-then
-	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LH_ARCHITECTURE}"
-fi
-
-if [ -n "${LH_BOOTSTRAP_CONFIG}" ]
-then
-	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --suite-config=${LH_BOOTSTRAP_CONFIG}"
-fi
-
-if [ -n "${LH_BOOTSTRAP_INCLUDE}" ]
-then
-	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --include=$(echo ${LH_BOOTSTRAP_INCLUDE} | sed 's|  *|,|g')"
-fi
-
-if [ -n "${LH_BOOTSTRAP_EXCLUDE}" ]
-then
-	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --exclude=$(echo ${LH_BOOTSTRAP_EXCLUDE} | sed 's|  *|,|g')"
-fi
-
-if [ -n "${LH_BOOTSTRAP_KEYRING}" ]
-then
-	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LH_BOOTSTRAP_KEYRING}"
-fi
-
-if [ -z "${LH_BOOTSTRAP_FLAVOUR}" ]
-then
-	case "${LH_PACKAGES_LISTS}" in
-		stripped|minimal)
-			CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
-			;;
-		*)
-			CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=standard"
-			;;
-	esac
-else
-	case "${LH_BOOTSTRAP_FLAVOUR}" in
-		stripped|minimal)
-			CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
-			;;
-
-		*)
-			CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=${LH_BOOTSTRAP_FLAVOUR}"
-			;;
-	esac
-fi
-
-if [ "${_DEBUG}" = "true" ]
-then
-	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --debug"
-fi
-
-if [ "${_QUIET}" = "true" ]
-then
-	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --quiet"
-fi
-
-if [ "${_VERBOSE}" = "true" ]
-then
-	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --verbose"
-fi
-
-if [ "${LH_APT_SECURE}" = "false" ]
-then
-	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --allow-unauthenticated"
-fi
-
-if [ -x "/usr/bin/cdebootstrap" ] || [ -x "/usr/bin/cdebootstrap-static" ]
-then
-	if [ "${LH_CACHE_PACKAGES}" = "true" ]
-	then
-		if ls cache/packages_bootstrap/*.deb > /dev/null 2>&1
-		then
-			mkdir -p chroot/var/cache/bootstrap
-			cp cache/packages_bootstrap/*.deb chroot/var/cache/bootstrap
-		fi
-
-		Echo_breakage "Running ${LH_BOOTSTRAP} (download-only)... "
-		${LH_ROOT_COMMAND} ${LH_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} --download-only "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}"
-
-		if [ -n "${LH_ROOT_COMMAND}" ]
-		then
-			${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
-		fi
-
-		# Removing old cache
-		rm -f cache/packages_bootstrap/*.deb
-
-		# Saving new cache
-		mkdir -p cache/packages_bootstrap
-		cp chroot/var/cache/bootstrap/*.deb cache/packages_bootstrap
-	fi
-
-	Echo_breakage "Running ${LH_BOOTSTRAP}... "
-	${LH_ROOT_COMMAND} ${LH_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}"
-
-	if [ -n "${LH_ROOT_COMMAND}" ]
-	then
-		${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
-	fi
-
-	# Remove cdebootstrap-helper-diverts (needed at least for minimal flavours)
-	case "${LH_PACKAGES_LISTS}" in
-		stripped|minimal)
-			Chroot chroot "dpkg -P cdebootstrap-helper-diverts"
-			;;
-	esac
-
-	# Deconfiguring cdebootstrap configurations
-	rm -f chroot/etc/apt/sources.list
-	rm -f chroot/etc/hosts
-	rm -f chroot/etc/resolv.conf
-
-	# Removing bootstrap cache
-	rm -rf chroot/var/cache/bootstrap
-
-	# Creating stage file
-	Create_stagefile .stage/bootstrap
-else
-	Echo_error "Can't process file /usr/bin/${LH_BOOTSTRAP} (FIXME)"
-	exit 1
-fi
diff --git a/helpers/bootstrap_copy b/helpers/bootstrap_copy
deleted file mode 100755
index 9373444..0000000
--- a/helpers/bootstrap_copy
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-
-# lh_bootstrap_copy(1) - bootstrap by copying the host system
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'bootstrap by copying the host system')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_BOOTSTRAP}" != "copy" ]
-then
-	exit 0
-fi
-
-# Check architecture
-Check_crossarchitecture
-
-Echo_message "Begin bootstrapping system..."
-
-# Ensure that a system is built as root
-lh testroot
-
-# Checking stage file
-Check_stagefile .stage/bootstrap
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Copying host system
-mkdir chroot
-cd chroot
-tar c / --exclude /proc --exclude /sys --exclude "$(dirname ${PWD})" | tar xv
-cd ..
-
-# Creating stage file
-Create_stagefile .stage/bootstrap
diff --git a/helpers/bootstrap_debootstrap b/helpers/bootstrap_debootstrap
deleted file mode 100755
index d7662fa..0000000
--- a/helpers/bootstrap_debootstrap
+++ /dev/null
@@ -1,157 +0,0 @@
-#!/bin/sh
-
-# lh_bootstrap_debootstrap(1) - bootstrap a Debian system with debootstrap(8)
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'bootstrap a Debian system with debootstrap(8)')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_BOOTSTRAP}" != "debootstrap" ]
-then
-	exit 0
-fi
-
-# Check architecture
-Check_crossarchitecture
-
-Echo_message "Begin bootstrapping system..."
-
-Check_package /usr/sbin/debootstrap debootstrap
-
-# Ensure that a system is built as root
-lh testroot
-
-# Checking stage file
-Check_stagefile .stage/bootstrap
-Check_stagefile .stage/bootstrap_cache.restore
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Creating chroot directory
-mkdir -p chroot
-
-# Setting debootstrap options
-if [ -n "${LH_ARCHITECTURE}" ]
-then
-	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch ${LH_ARCHITECTURE}"
-fi
-
-if [ "${LH_ARCHIVE_AREAS}" != "main" ]
-then
-	# Modify archive areas to remove leading/trailing whitespaces and replace other whitepspace with commas
-	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components $(echo ${LH_ARCHIVE_AREAS} | sed -e 's| |,|g')"
-fi
-
-if [ -n "${LH_BOOTSTRAP_CONFIG}" ]
-then
-	if [ -d "/usr/share/debootstrap/scripts/" ]
-	then
-		LH_DEBOOTSTRAP_SCRIPT="/usr/share/debootstrap/scripts/${LH_BOOTSTRAP_CONFIG}"
-	else
-		LH_DEBOOTSTRAP_SCRIPT="/usr/lib/debootstrap/scripts/${LH_BOOTSTRAP_CONFIG}"
-	fi
-fi
-
-if [ -n "${LH_BOOTSTRAP_INCLUDE}" ]
-then
-	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --include=$(echo ${LH_BOOTSTRAP_INCLUDE} | sed 's|  *|,|g')"
-fi
-
-if [ -n "${LH_BOOTSTRAP_EXCLUDE}" ]
-then
-	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --exclude=$(echo ${LH_BOOTSTRAP_EXCLUDE} | sed 's|  *|,|g')"
-fi
-
-if [ "${LH_USE_FAKEROOT}" != "true" ]
-then
-	if [ -z "${LH_BOOTSTRAP_FLAVOUR}" ]
-	then
-		if In_list "stripped minimal" "${LH_PACKAGES_LISTS}"
-		then
-			DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=minbase"
-		fi
-	else
-		case "${LH_BOOTSTRAP_FLAVOUR}" in
-			stripped|minimal)
-				DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=minbase"
-				;;
-			standard)
-				;;
-
-			*)
-				DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=${LH_BOOTSTRAP_FLAVOUR}"
-		esac
-	fi
-else
-	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=fakechroot"
-fi
-
-if [ "${_VERBOSE}" = "true" ]
-then
-	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --verbose"
-fi
-
-if [ -x "/usr/sbin/debootstrap" ]
-then
-	if [ "${LH_CACHE_PACKAGES}" = "true" ]
-	then
-		if ls cache/packages_bootstrap/*.deb > /dev/null 2>&1
-		then
-			mkdir -p chroot/var/cache/apt/archives
-			cp cache/packages_bootstrap/*.deb chroot/var/cache/apt/archives
-		fi
-
-		Echo_breakage "Running debootstrap (download-only)... "
-		${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}" "${LH_DEBOOTSTRAP_SCRIPT}"
-
-		if [ -n "${LH_ROOT_COMMAND}" ]
-		then
-			${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
-		fi
-
-		# Removing old cache
-		rm -f cache/packages_bootstrap/*.deb
-
-		# Saving new cache
-		mkdir -p cache/packages_bootstrap
-		cp chroot/var/cache/apt/archives/*.deb cache/packages_bootstrap
-	fi
-
-	Echo_breakage "Running debootstrap... "
-	${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}" "${LH_DEBOOTSTRAP_SCRIPT}"
-
-	if [ -n "${LH_ROOT_COMMAND}" ]
-	then
-		${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
-	fi
-
-	# Removing bootstrap cache
-	rm -f chroot/var/cache/apt/archives/*.deb
-
-	# Creating stage file
-	Create_stagefile .stage/bootstrap
-else
-	Echo_error "Can't process file /usr/bin/debootstrap (FIXME)"
-	exit 1
-fi
diff --git a/helpers/build b/helpers/build
deleted file mode 100755
index a4b8802..0000000
--- a/helpers/build
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/sh
-
-# lh_build(1) - build a Debian Live system
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Automatically populating config tree
-if [ -x auto/config ] && [ ! -e .stage/config ]
-then
-	Echo_message "Automatically populating config tree."
-	lh config
-fi
-
-# Read meta config
-if [ "${1}" != "noauto" ] && [ -x auto/build ]
-then
-	Echo_message "Executing auto/build script."
-	./auto/build ${@}
-fi
-
-if [ "${1}" = "noauto" ]
-then
-	shift
-fi
-
-# Setting static variables
-DESCRIPTION="$(Echo 'build a Debian Live system')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-if [ ! -d config ]
-then
-	Echo_warning "No config/ directory; using defaults for all options"
-fi
-
-if [ "$(pwd)" = "/" ]
-then
-	Echo_error "Cannot build live image from the root directory (/)"
-	exit 1
-fi
-
-if echo $(pwd) | grep -qs " "
-then
-	Echo_error "Cannot build live image from a directory containing spaces"
-	exit 1
-fi
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Checking defaults
-Check_defaults
-
-# Bootstrapping system
-lh bootstrap ${*}
-
-# Customizing chroot
-lh chroot ${*}
-
-# Building binary images
-lh binary ${*}
-
-# Building source images
-lh source ${*}
diff --git a/helpers/chroot b/helpers/chroot
deleted file mode 100755
index 123da37..0000000
--- a/helpers/chroot
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-
-# lh_chroot(1) - customize the Debian system
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'customize the Debian system')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Setup cleanup function
-Setup_cleanup
-
-# Configuring chroot
-lh chroot_cache restore ${*}
-lh chroot_devpts install ${*}
-lh chroot_proc install ${*}
-lh chroot_selinuxfs install ${*}
-lh chroot_sysfs install ${*}
-lh chroot_debianchroot install ${*}
-lh chroot_dpkg install ${*}
-lh chroot_sysv-rc install ${*}
-lh chroot_upstart install ${*}
-lh chroot_hosts install ${*}
-lh chroot_resolv install ${*}
-lh chroot_hostname install ${*}
-lh chroot_apt install ${*}
-lh chroot_sources install ${*}
-lh chroot_linux-image install ${*}
-
-# Customizing chroot
-lh chroot_preseed ${*}
-lh chroot_local-preseed ${*}
-lh chroot_tasks ${*}
-lh chroot_packageslists ${*}
-lh chroot_local-packageslists ${*}
-lh chroot_packages ${*}
-lh chroot_local-packages ${*}
-lh chroot_install-packages ${*}
-lh chroot_localization ${*}
-lh chroot_local-includes ${*}
-lh chroot_local-patches ${*}
-lh chroot_sysvinit ${*}
-lh chroot_local-hooks ${*}
-lh chroot_hooks ${*}
-lh chroot_symlinks ${*}
-lh chroot_hacks ${*}
-lh chroot_interactive ${*}
-
-# Deconfiguring chroot
-lh chroot_linux-image remove ${*}
-lh chroot_sources remove ${*}
-lh chroot_apt remove ${*}
-lh chroot_hostname remove ${*}
-lh chroot_resolv remove ${*}
-lh chroot_hosts remove ${*}
-lh chroot_sysv-rc remove ${*}
-lh chroot_upstart remove ${*}
-lh chroot_dpkg remove ${*}
-lh chroot_debianchroot remove ${*}
-lh chroot_sysfs remove ${*}
-lh chroot_selinuxfs remove ${*}
-lh chroot_proc remove ${*}
-lh chroot_devpts remove ${*}
-lh chroot_cache save ${*}
diff --git a/helpers/chroot_apt b/helpers/chroot_apt
deleted file mode 100755
index 06ac8ac..0000000
--- a/helpers/chroot_apt
+++ /dev/null
@@ -1,242 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_apt(1) - manage /etc/apt/apt.conf
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'manage /etc/apt/apt.conf')"
-HELP=""
-USAGE="${PROGRAM} {install|install-binary|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-case "${1}" in
-	install|install-binary)
-		Echo_message "Configuring file /etc/apt/apt.conf"
-
-		# Checking stage file
-		Check_stagefile .stage/chroot_apt
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		mkdir -p chroot/etc/apt/apt.conf.d
-
-		# Configuring apt ftp proxy
-		if [ -n "${LH_APT_FTP_PROXY}" ]
-		then
-			echo "Acquire::ftp::Proxy \"${LH_APT_FTP_PROXY}\";" > chroot/etc/apt/apt.conf.d/00ftp-proxy
-		fi
-
-		# Configuring apt http proxy
-		if [ -n "${LH_APT_HTTP_PROXY}" ]
-		then
-			echo "Acquire::http::Proxy \"${LH_APT_HTTP_PROXY}\";" > chroot/etc/apt/apt.conf.d/00http-proxy
-		fi
-
-		# Configuring apt pdiffs
-		case "${LH_APT_PDIFFS}" in
-			true)
-				echo "Acquire::PDiffs \"true\";" > chroot/etc/apt/apt.conf.d/00pdiffs
-				;;
-
-			false)
-				echo "Acquire::PDiffs \"false\";" > chroot/etc/apt/apt.conf.d/00pdiffs
-				;;
-		esac
-
-		# Configuring apt pipeline
-		if [ -n "${LH_APT_PIPELINE}" ]
-		then
-			echo "Acquire::http::Pipeline-Depth \"${LH_APT_PIPELINE}\";" > chroot/etc/apt/apt.conf.d/00pipeline
-		fi
-
-		# Configuring apt recommends
-		case "${LH_APT_RECOMMENDS}" in
-			true)
-				echo "APT::Install-Recommends \"true\";" > chroot/etc/apt/apt.conf.d/00recommends
-				echo "Aptitude::Recommends-Important \"true\";" >> chroot/etc/apt/apt.conf.d/00recommends
-				;;
-
-			false)
-				echo "APT::Install-Recommends \"false\";" > chroot/etc/apt/apt.conf.d/00recommends
-				echo "Aptitude::Recommends-Important \"false\";" >> chroot/etc/apt/apt.conf.d/00recommends
-				;;
-		esac
-
-		# Configuring apt secure
-		case "${LH_APT_SECURE}" in
-			true)
-				echo "APT::Get::AllowUnauthenticated \"false\";" > chroot/etc/apt/apt.conf.d/00secure
-				echo "Aptitude::CmdLine::Ignore-Trust-Violations \"false\";" >> chroot/etc/apt/apt.conf.d/00secure
-				;;
-
-			false)
-				echo "APT::Get::AllowUnauthenticated \"true\";" > chroot/etc/apt/apt.conf.d/00secure
-				echo "Aptitude::CmdLine::Ignore-Trust-Violations \"true\";" >> chroot/etc/apt/apt.conf.d/00secure
-				;;
-		esac
-
-		# Configuring apt config
-		if [ -f config/chroot_apt/apt.conf ]
-		then
-			if [ -f chroot/etc/apt/apt.conf ]
-			then
-				mv chroot/etc/apt/apt.conf chroot/etc/apt/apt.conf.orig
-			fi
-
-			cp config/chroot_apt/apt.conf chroot/etc/apt/apt.conf
-		fi
-
-		# Configuring apt preferences
-		if [ -f config/chroot_apt/preferences ]
-		then
-			if [ -f chroot/etc/apt/preferences ]
-			then
-				mv chroot/etc/apt/preferences chroot/etc/apt/preferences.orig
-			fi
-
-			cp config/chroot_apt/preferences chroot/etc/apt/preferences
-		fi
-
-		if Find_files config/chroot_local-packages/*.deb
-		then
-			echo >> chroot/etc/apt/preferences
-			echo "# Added by lh_chroot_apt ${@}" >> chroot/etc/apt/preferences
-			echo "Package: *" >> chroot/etc/apt/preferences
-			echo "Pin: release o=chroot_local-packages" >> chroot/etc/apt/preferences
-
-			case "${1}" in
-				install)
-					# Ensure local packages have priority
-					echo "Pin-Priority: 1001" >> chroot/etc/apt/preferences
-					;;
-
-				install-binary)
-					# Ensure local packages are not re-installed during lh_binary
-					echo "Pin-Priority: 99" >> chroot/etc/apt/preferences
-
-					echo >> chroot/etc/apt/preferences
-					echo "Package: *" >> chroot/etc/apt/preferences
-					echo "Pin: release o=debian" >> chroot/etc/apt/preferences
-					echo "Pin-Priority: 99" >> chroot/etc/apt/preferences
-					;;
-			esac
-		fi
-
-		# Creating stage file
-		Create_stagefile .stage/chroot_apt
-		;;
-
-	remove)
-		Echo_message "Deconfiguring file /etc/apt/apt.conf"
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		# Deconfiguring aptitude ftp proxy
-		rm -f chroot/etc/apt/apt.conf.d/00ftp-proxy
-
-		# Deconfiguring aptitude http proxy
-		rm -f chroot/etc/apt/apt.conf.d/00http-proxy
-
-		# Deconfiguring aptitude pdiffs
-		if [ "${LH_APT_PDIFFS}" = "true" ]
-		then
-			rm -f chroot/etc/apt/apt.conf.d/00pdiffs
-		fi
-
-		# Deconfiguring aptitude pipeline
-		rm -f chroot/etc/apt/apt.conf.d/00pipeline
-
-		# Deconfiguring aptitude recommends
-		if [ "${LH_APT_RECOMMENDS}" = "true" ]
-		then
-			rm -f chroot/etc/apt/apt.conf.d/00recommends
-		fi
-
-		# Deconfiguring aptitude secure
-		if [ "${LH_APT_SECURE}" = "true" ]
-		then
-			rm -f chroot/etc/apt/apt.conf.d/00secure
-		fi
-
-		# Configuring apt config
-		if [ -f config/chroot_apt/apt.conf ]
-		then
-			if [ -f chroot/etc/apt/apt.conf ]
-			then
-				mv chroot/etc/apt/apt.conf chroot/etc/apt/apt.conf.orig
-			fi
-
-			cp config/chroot_apt/apt.conf chroot/etc/apt/apt.conf
-
-			if [ -f chroot/etc/apt/apt.conf.orig ]
-			then
-				mv chroot/etc/apt/apt.conf.orig chroot/etc/apt/apt.conf
-			fi
-		fi
-
-		# Deconfiguring apt preferences
-		if [ -f config/chroot_apt/preferences ]
-		then
-			if [ -f chroot/etc/apt/preferences ]
-			then
-				mv chroot/etc/apt/preferences chroot/etc/apt/preferences.orig
-			fi
-
-			cp config/chroot_apt/preferences chroot/etc/apt/preferences
-
-			if [ -f chroot/etc/apt/preferences.orig ]
-			then
-				mv chroot/etc/apt/preferences.orig chroot/etc/apt/preferences
-			fi
-		fi
-
-		if Find_files config/chroot_local-packages/*.deb
-		then
-			if [ -f chroot/etc/apt/preferences ]
-			then
-				# delete additions from lh_chroot_apt install|install-binary to preferences
-				sed -i '/# Added by lh_chroot_apt/,$d' chroot/etc/apt/preferences
-				# delete the last empty line
-				sed -i '${/^[[:blank:]]*$/d;}' chroot/etc/apt/preferences
-				# if the resulting preferences file is empty there was no user additions, remove it
-				if [ ! -s chroot/etc/apt/preferences ]
-				then
-					rm -rf chroot/etc/apt/preferences
-				fi
-			fi
-
-		fi
-
-		# Removing stage file
-		rm -f .stage/chroot_apt
-		;;
-
-	*)
-		Usage
-		;;
-esac
diff --git a/helpers/chroot_cache b/helpers/chroot_cache
deleted file mode 100755
index 7c67336..0000000
--- a/helpers/chroot_cache
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_cache(1) - cach chroot stage
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'cache chroot stage')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin caching chroot stage..."
-
-for STAGE in ${LH_CACHE_STAGES}
-do
-	if [ "${STAGE}" = "chroot" ]
-	then
-		case "${1}" in
-			restore)
-				# Checking stage file
-				Check_stagefile .stage/chroot_cache.restore
-
-				if [ -d cache/stages_chroot ]
-				then
-					# Checking lock file
-					Check_lockfile .lock
-
-					# Creating lock file
-					Create_lockfile .lock
-
-					# Removing old chroot
-					rm -rf chroot
-
-					# Restoring old cache
-					${LH_ROOT_COMMAND} cp -a cache/stages_chroot chroot
-
-					if [ -n "${LH_ROOT_COMMAND}" ]
-					then
-						${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
-					fi
-
-					# Creating stage file
-					Create_stagefile .stage/chroot_cache.restore
-
-					exit 0
-				fi
-				;;
-
-			save)
-				# Checking stage file
-				Check_stagefile .stage/chroot_cache.save
-
-				# Checking lock file
-				Check_lockfile .lock
-
-				# Creating lock file
-				Create_lockfile .lock
-
-				rm -rf cache/stages_chroot
-
-				mkdir -p cache
-
-				${LH_ROOT_COMMAND} cp -a chroot cache/stages_chroot
-
-				if [ -n "${LH_ROOT_COMMAND}" ]
-				then
-					${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) cache/stages_chroot
-				fi
-
-				# Creating stage file
-				Create_stagefile .stage/chroot_cache.save
-				;;
-		esac
-	fi
-done
diff --git a/helpers/chroot_debianchroot b/helpers/chroot_debianchroot
deleted file mode 100755
index 0e794ed..0000000
--- a/helpers/chroot_debianchroot
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_debianchroot(1) - manage /etc/debian_chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'manage /etc/debian_chroot')"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-case "${1}" in
-	install)
-		Echo_message "Configuring file /etc/debian_chroot"
-
-		# Checking stage file
-		Check_stagefile .stage/chroot_debianchroot
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		if [ -f chroot/etc/debian_chroot ]
-		then
-			# Save chroot file
-			mv chroot/etc/debian_chroot chroot/etc/debian_chroot.orig
-		fi
-
-		# Create chroot file
-		echo "live" > chroot/etc/debian_chroot
-
-		# Creating stage file
-		Create_stagefile .stage/chroot_debianchroot
-		;;
-
-	remove)
-		Echo_message "Deconfiguring file /etc/debian_chroot"
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		if [ -f chroot/etc/debian_chroot.orig ]
-		then
-			# Restore chroot file
-			mv chroot/etc/debian_chroot.orig chroot/etc/debian_chroot
-		else
-			# Remove chroot file
-			rm -f chroot/etc/debian_chroot
-		fi
-
-		# Removing stage file
-		rm -f .stage/chroot_debianchroot
-		;;
-
-	*)
-		Usage
-		;;
-esac
diff --git a/helpers/chroot_devpts b/helpers/chroot_devpts
deleted file mode 100755
index b8a4bb2..0000000
--- a/helpers/chroot_devpts
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_devpts(1) - mount /dev/pts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'mount /dev/pts')"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Ensure that a system is built as root
-lh testroot
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-case "${1}" in
-	install)
-		Echo_message "Begin mounting /dev/pts..."
-
-		# Checking stage file
-		Check_stagefile .stage/chroot_devpts
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		if [ "${LH_USE_FAKEROOT}" != "true" ]
-		then
-			# Creating mountpoint
-			mkdir -p chroot/dev/pts
-
-			# Mounting /dev/pts
-			${LH_ROOT_COMMAND} mount devpts-live -t devpts chroot/dev/pts || true
-		fi
-
-		# Creating stage file
-		Create_stagefile .stage/chroot_devpts
-		;;
-
-	remove)
-		Echo_message "Begin unmounting /dev/pts..."
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		# Unmounting /dev/pts
-		if [ "${LH_USE_FAKEROOT}" != "true" ]
-		then
-			if grep -qs "$(pwd)/chroot/dev/pts" /proc/mounts || Find_files chroot/dev/pts/*
-			then
-				${LH_ROOT_COMMAND} umount chroot/dev/pts
-			else
-				${LH_ROOT_COMMAND} umount -f chroot/dev/pts > /dev/null 2>&1 || true
-			fi
-		fi
-
-		# Removing stage file
-		rm -f .stage/chroot_devpts
-		;;
-
-	*)
-		Usage
-		;;
-esac
diff --git a/helpers/chroot_dpkg b/helpers/chroot_dpkg
deleted file mode 100755
index 98ca282..0000000
--- a/helpers/chroot_dpkg
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_dpkg(1) - manage /sbin/dpkg
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'manage /sbin/dpkg')"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-case "${1}" in
-	install)
-		Echo_message "Configuring file /sbin/start-stop-daemon"
-
-		# Checking stage file
-		Check_stagefile .stage/chroot_dpkg
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		# Save start-stop-daemon program
-		mv chroot/sbin/start-stop-daemon chroot/sbin/start-stop-daemon.orig
-
-		# Create start-stop-daemon program
-
-cat > chroot/sbin/start-stop-daemon << EOF
-#!/bin/sh
-
-exit 0
-EOF
-
-		chmod 755 chroot/sbin/start-stop-daemon
-
-		# Manual hacks for special packages
-
-		# samhain
-		if [ -e /var/state/samhain/samhain_file ]
-		then
-			mv /var/state/samhain/samhain_file /var/state/samhain/samhain_file.orig
-		else
-			mkdir -p /var/state/samhain
-			touch /var/state/samhain/samhain_file
-		fi
-
-		# Creating stage file
-		Create_stagefile .stage/chroot_dpkg
-		;;
-
-	remove)
-		Echo_message "Deconfiguring file /sbin/start-stop-daemon"
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		# Manual hacks for special packages
-
-		# samhain
-		if [ -e /var/state/samhain/samhain_file.orig ]
-		then
-			mv /var/state/samhain/samhain_file.orig /var/state/samhain/samhain_file
-		elif [ -d /var/state/samhain ]
-		then
-			rm -f /var/state/samhain/samhain_file
-			rmdir --ignore-fail-on-non-empty /var/state/samhain || true
-		fi
-
-		# Restore start-stop-daemon program
-		if [ -e chroot/sbin/start-stop-daemon.orig ]
-		then
-			mv chroot/sbin/start-stop-daemon.orig chroot/sbin/start-stop-daemon
-		fi
-
-		# Removing stage file
-		rm -f .stage/chroot_dpkg
-		;;
-
-	*)
-		Usage
-		;;
-esac
diff --git a/helpers/chroot_hacks b/helpers/chroot_hacks
deleted file mode 100755
index abfda7c..0000000
--- a/helpers/chroot_hacks
+++ /dev/null
@@ -1,287 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_hacks(1) - execute hacks in chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'execute hacks in chroot')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin executing hacks..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_hacks
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Handling default desktop configuration
-for TASK in ${LH_TASKS}
-do
-	case "${LH_DISTRIBUTION}" in
-		lenny)
-			GDM="gdm"
-			;;
-
-		*)
-			GDM="gdm3"
-			;;
-	esac
-
-	case "${TASK}" in
-		gnome-desktop)
-			# gnome is the only desktop environment in this image
-			if [ -z "$(echo ${LH_TASKS} | sed -e 's|gnome-desktop||' -e 's| desktop ||' | grep desktop)" ]
-			then
-				# set display manager
-				echo "${GDM} shared/default-x-display-manager select ${GDM}" > chroot/root/preseed
-				Chroot chroot "debconf-set-selections /root/preseed"
-				rm -f chroot/root/preseed
-				Chroot chroot "dpkg-reconfigure ${GDM}"
-				echo "/usr/bin/${GDM}" > chroot/etc/X11/default-display-manager
-
-				# set session manager
-				Chroot chroot "update-alternatives --set x-session-manager /usr/bin/gnome-session"
-			fi
-			;;
-
-		kde-desktop)
-			# kde is the only desktop-environment in this image
-			if [ -z "$(echo ${LH_TASKS} | sed -e 's|kde-desktop||' -e 's| desktop ||' | grep desktop)" ]
-			then
-				# set display manager
-				echo "kdm shared/default-x-display-manager select kdm" > chroot/root/preseed
-				Chroot chroot "debconf-set-selections /root/preseed"
-				rm -f chroot/root/preseed
-				Chroot chroot "dpkg-reconfigure kdm"
-				echo "/usr/bin/kdm" > chroot/etc/X11/default-display-manager
-
-				# set session manager
-				Chroot chroot "update-alternatives --set x-session-manager /usr/bin/startkde"
-
-				# get rid of resolvconf
-				Chroot chroot "dpkg -P resolvconf"
-			fi
-			;;
-
-		lxde-desktop)
-			# lxde is the only desktop environment in this image
-			if [ -z "$(echo ${LH_TASKS} | sed -e 's|lxde-desktop||' -e 's| desktop ||' | grep desktop)" ]
-			then
-				# set display manager
-				echo "${GDM} shared/default-x-display-manager select ${GDM}" > chroot/root/preseed
-				Chroot chroot "debconf-set-selections /root/preseed"
-				rm -f chroot/root/preseed
-				Chroot chroot "dpkg-reconfigure ${GDM}"
-				echo "/usr/bin/${GDM}" > chroot/etc/X11/default-display-manager
-
-				# set session manager
-				Chroot chroot "update-alternatives --set x-session-manager /usr/bin/startlxde"
-			fi
-			;;
-
-		xfce-desktop)
-			# xfce is the only desktop environment in this image
-			if [ -z "$(echo ${LH_TASKS} | sed -e 's|xfce-desktop||' -e 's| desktop ||' | grep desktop)" ]
-			then
-				# set display manager
-				echo "${GDM} shared/default-x-display-manager select ${GDM}" > chroot/root/preseed
-				Chroot chroot "debconf-set-selections /root/preseed"
-				rm -f chroot/root/preseed
-				Chroot chroot "dpkg-reconfigure ${GDM}"
-				echo "/usr/bin/${GDM}" > chroot/etc/X11/default-display-manager
-
-				# set session manager
-				Chroot chroot "update-alternatives --set x-session-manager /usr/bin/xfce4-session"
-			fi
-			;;
-	esac
-done
-
-# Removing openssh-server hostkeys,
-# they are regenerated by live-config.
-#rm -f chroot/etc/ssh/ssh_host_dsa_key chroot/etc/ssh/ssh_host_dsa_key.pub
-#rm -f chroot/etc/ssh/ssh_host_rsa_key chroot/etc/ssh/ssh_host_rsa_key.pub
-
-# Removing udev mac caching rule
-rm -f chroot/etc/udev/rules.d/*persistent-net.rules
-
-case "${LH_BINARY_IMAGES}" in
-	net)
-		if [ ! -f chroot/usr/bin/smbmount ]
-		then
-			Apt install smbfs
-		fi
-
-		if [ ! -d chroot/etc/initramfs-tools ]
-		then
-			mkdir chroot/etc/initramfs-tools
-		fi
-		if [ ! "$(grep 'MODULES=netboot' chroot/etc/initramfs-tools/initramfs.conf)" ]
-		then
-			# Configuring initramfs for NFS
-cat >> chroot/etc/initramfs-tools/initramfs.conf << EOF
-MODULES=netboot
-BOOT=nfs
-NFSROOT=auto
-EOF
-		fi
-		;;
-esac
-
-# Update initramfs (always, because of udev rules in initrd)
-case "${LH_INITRAMFS}" in
-	live-initramfs)
-		#UPDATE_INITRAMFS_OPTIONS="LIVE_GENERATE_UUID=1"
-		;;
-
-	casper)
-		UPDATE_INITRAMFS_OPTIONS="CASPER_GENERATE_UUID=1"
-		;;
-esac
-
-Chroot chroot "${UPDATE_INITRAMFS_OPTIONS} update-initramfs -k all -t -u"
-
-# Ensure readable permissions on initramfs. loop-aes-utils sets umask to
-# protect GPG keys, which live-helper does not support.
-# Note: Use find rather than chmod on the wildcard, one never knows what
-# people might do in local hooks, and there might be no initrds at all.
-find chroot/boot -name 'initrd*' -print0 | xargs -r -0 chmod go+r
-
-# Remove build systems clock drift
-echo "0.0 0 0.0" > chroot/etc/adjtime
-
-# Remove cruft
-rm -f chroot/boot/initrd*bak*
-rm -f chroot/etc/apt/trusted.gpg~
-rm -f chroot/etc/group- chroot/etc/passwd-
-rm -f chroot/etc/gshadow- chroot/etc/shadow-
-rm -f chroot/var/cache/debconf/*-old
-rm -f chroot/var/lib/dpkg/*-old
-rm -f chroot/var/log/apt/term.log
-
-if [ -n "${LH_ROOT_COMMAND}" ]
-then
-	${LH_ROOT_COMMAND} chown -R --quiet $(whoami):$(whoami) chroot
-fi
-
-case "${LH_INITRAMFS}" in
-	casper)
-		ID="999"
-		;;
-
-	*)
-		ID="1000"
-		;;
-esac
-
-if [ -d chroot/home/${LH_USERNAME} ]
-then
-	chown -R --quiet ${ID}:${ID} chroot/home/${LH_USERNAME}
-fi
-
-if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
-then
-	# This is a temporary hack to get rid of fstab;
-	# needs cleanup in live-initramfs first to proper fix.
-	rm -f chroot/etc/fstab
-
-	# There is a timing issue somewhere when using live-installer
-	# and the apt-get update waypoint: At the time when we're installing
-	# bootloader, it tries to fetch them from the net but the e.g.
-	# 'chroot /target apt-get install grub' fails because of missing
-	# packages lists. As a very cheap workaround, we ensure that the
-	# bootloader is already installed in the image. Very ugly, but it's to
-	# late to fix it in d-i because lenny rc2 has been already released.
-	case "${LH_ARCHITECTURE}" in
-		amd64|i386)
-			case "${LH_BOOTLOADER}" in
-				grub)
-					Apt install grub
-					;;
-
-				grub2)
-					Apt install grub2
-					;;
-			esac
-			;;
-
-		powerpc)
-			Apt install yaboot
-			;;
-	esac
-fi
-
-if [ "${LH_EXPOSED_ROOT}" = "true" ]
-then
-	# Make sure RW dirs exist so that the initramfs script has
-	# a directory in which to bind the tmpfs filesystems
-	COW_DIRECTORIES="/home /live /tmp /var/lib/live /var/lock /var/log /var/run /var/tmp /var/spool"
-
-	for DIRECTORY in ${COW_DIRECTORIES}
-	do
-		mkdir -p chroot/"${DIRECTORY}"
-	done
-
-	# Config files which need to be RW
-	COW_FILES="/etc/adjtime /etc/fstab /etc/hostname /etc/hosts /etc/live.conf /etc/network/interfaces /etc/resolv.conf /etc/udev/rules.d/*persistent-net.rules /etc/udev/rules.d/*persistent-cd.rules /etc/X11/xorg.conf"
-
-	# Where we will store RW config files
-	RW_DIRECTORY="/var/lib/live"
-
-	for FILE in ${COW_FILES}
-	do
-		DIRECTORY="$(dirname ${FILE})"
-		FILE="$(basename ${FILE})"
-		RELATIVE_PATH="$(echo ${DIRECTORY} | sed 's|[^/]\+|..|g; s|^/||g')"
-
-		# Touch files in case they don't yet exist
-		mkdir -p chroot/${DIRECTORY}
-		touch chroot/${DIRECTORY}/${FILE}
-
-		# Move files to the read-write directory
-		mkdir -p chroot/${RW_DIRECTORY}/${DIRECTORY}
-		mv chroot/${DIRECTORY}/${FILE} chroot/${RW_DIRECTORY}/${DIRECTORY}
-
-		# Create a symbolic link to RW config file
-		ln -s ${RELATIVE_PATH}/${RW_DIRECTORY}/${DIRECTORY}/${FILE} chroot/${DIRECTORY}/${FILE}
-	done
-
-	# Mount doesn't write to a symlink so use /proc/mounts instead,
-	# see debian bug #154438 for more info
-	rm -f chroot/etc/mtab
-	ln -s /proc/mounts chroot/etc/mtab
-fi
-
-# Show popular warnings
-if [ -e chroot/etc/init.d/resolvconf ]
-then
-	Echo_warning "Your live system appears to include resolvconf which is by its nature incompatible in most ways with debian-live."
-	Echo_warning "Keeping resolvconf installed *can* lead to broken network support in the resulting live system."
-	Echo_warning "Unless you really know what you are doing, we recommend that you neither install resolvconf explicitly nor implicitly through another package's relation (e.g. by having automatic installation of recommended packages to true)."
-fi
-
-# Creating stage file
-Create_stagefile .stage/chroot_hacks
diff --git a/helpers/chroot_hooks b/helpers/chroot_hooks
deleted file mode 100755
index b8105ff..0000000
--- a/helpers/chroot_hooks
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_hooks(1) - execute hooks in chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'execute hooks in chroot')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin executing hooks..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_hooks
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Processing hooks
-HOOKS="$(echo ${LH_HOOKS} ${LH_PACKAGES_LISTS} ${LH_TASKS} | sed -e 's| |\n|g' | sort -u)"
-
-for HOOK in ${HOOKS}
-do
-	if [ -f ${LH_BASE:-/usr/share/live-helper}/hooks/"${HOOK}" ]
-	then
-		# Copying hook
-		cp ${LH_BASE:-/usr/share/live-helper}/hooks/"${HOOK}" chroot/root
-
-		# Making hook executable
-		if [ ! -x chroot/root/"${HOOK}" ]
-		then
-			chmod +x chroot/root/"${HOOK}"
-		fi
-
-		# Executing hook
-		Chroot chroot "./root/${HOOK}" || ( Echo_error "${HOOK} failed (exit non-zero). You should check for errors."; exit 1 )
-
-		# Removing hook
-		rm -f chroot/root/"${HOOK}"
-
-		# Creating stage file
-		Create_stagefile .stage/chroot_hooks
-	fi
-done
diff --git a/helpers/chroot_hostname b/helpers/chroot_hostname
deleted file mode 100755
index 3d409c3..0000000
--- a/helpers/chroot_hostname
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_hostname(1) - manage /bin/hostname
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'manage /bin/hostname')"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-case "${1}" in
-	install)
-		Echo_message "Configuring file /etc/hostname"
-
-		# Checking stage file
-		Check_stagefile .stage/chroot_hostname
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		# Save hostname
-		mv chroot/bin/hostname chroot/bin/hostname.orig
-
-		# Create hostname file
-		echo "localhost.localdomain" > chroot/etc/hostname
-
-		Echo_message "Configuring file /bin/hostname"
-
-		# Create hostname program
-
-cat > chroot/bin/hostname << EOF
-#!/bin/sh
-
-echo "localhost.localdomain"
-EOF
-
-		chmod 755 chroot/bin/hostname
-
-		# Creating stage file
-		Create_stagefile .stage/chroot_hostname
-		;;
-
-	remove)
-		Echo_message "Deconfiguring file /etc/hostname"
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		# Copying hostname from local-includes, if existing
-		if [ -e config/chroot_local-includes/etc/hostname ]
-		then
-			cp -a config/chroot_local-includes/etc/hostname chroot/etc/hostname
-		fi
-
-		Echo_message "Deconfiguring file /bin/hostname"
-
-		# Restore hostname file
-		if [ -e chroot/bin/hostname.orig ]
-		then
-			mv chroot/bin/hostname.orig chroot/bin/hostname
-		fi
-
-		# Removing stage file
-		rm -f .stage/chroot_hostname
-		;;
-
-	*)
-		Usage
-		;;
-esac
diff --git a/helpers/chroot_hosts b/helpers/chroot_hosts
deleted file mode 100755
index d06cb2c..0000000
--- a/helpers/chroot_hosts
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_hosts(1) - manage /etc/hosts
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'manage /etc/hosts')"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-case "${1}" in
-	install)
-		Echo_message "Configuring file /etc/hosts"
-
-		# Checking stage file
-		Check_stagefile .stage/chroot_hosts
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		if [ -f chroot/etc/hosts ]
-		then
-			# Save hosts file
-			mv chroot/etc/hosts chroot/etc/hosts.orig
-		fi
-
-		# Creating hosts file
-
-cat > chroot/etc/hosts << EOF
-127.0.0.1	localhost localhost.localdomain
-127.0.1.1	debian
-EOF
-
-		if [ -f /etc/hosts ]
-		then
-			# Append hosts file
-			#grep -e "127.0.0.1" -e "127.0.1.1" /etc/hosts >> chroot/etc/hosts
-			cat /etc/hosts >> chroot/etc/hosts
-		fi
-
-		# Creating stage file
-		Create_stagefile .stage/chroot_hosts
-		;;
-
-	remove)
-		Echo_message "Deconfiguring file /etc/hosts"
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		if [ -e config/chroot_local-includes/etc/hosts ]
-		then
-			# Copying local hosts
-			cp -a config/chroot_local-includes/etc/hosts chroot/etc/hosts
-			rm -f chroot/etc/hosts.orig
-		elif [ -f chroot/etc/hosts.orig ]
-		then
-			# Restore hosts file
-			mv chroot/etc/hosts.orig chroot/etc/hosts
-		else
-			# Blank out hosts file, don't remove in case
-			# its a symlink, as in the case of exposedroot mode
-			Truncate chroot/etc/hosts
-		fi
-
-		# Removing stage file
-		rm -f .stage/chroot_hosts
-		;;
-
-	*)
-		Usage
-		;;
-esac
diff --git a/helpers/chroot_install-packages b/helpers/chroot_install-packages
deleted file mode 100755
index 60b13f4..0000000
--- a/helpers/chroot_install-packages
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_install-packages(1) - install queued packages into chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'install queued packages into chroot')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin installing packages..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_install-packages
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ -e chroot/root/chroot_packages ] && [ -s chroot/root/chroot_packages ]
-then
-	# Restoring cache
-	Restore_cache cache/packages_chroot
-
-	# Installing packages
-	case "${LH_APT}" in
-		apt|apt-get)
-			Chroot chroot "xargs --arg-file=/root/chroot_packages apt-get ${APT_OPTIONS} install"
-			;;
-
-		aptitude)
-			Chroot chroot "xargs --arg-file=/root/chroot_packages aptitude ${APTITUDE_OPTIONS} install"
-			;;
-	esac
-
-	# Tidying up
-	rm -f chroot/root/chroot_packages
-
-	# Saving cache
-	Save_cache cache/packages_chroot
-
-fi
-
-# Creating stage file
-Create_stagefile .stage/chroot_install-packages
diff --git a/helpers/chroot_interactive b/helpers/chroot_interactive
deleted file mode 100755
index 114d85b..0000000
--- a/helpers/chroot_interactive
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_interactive(1) - make build interactive
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'make build interactive')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_INTERACTIVE}" = "false" ]
-then
-	exit 0
-fi
-
-Echo_message "Begin interactive build..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_interactive
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-case "${LH_INTERACTIVE}" in
-	true|shell)
-		Echo_message "Pausing build: starting interactive shell..."
-			Chroot chroot "/bin/bash --login"
-		;;
-		x11)
-		Echo_message "Pausing build: starting interactive X11..."
-			Chroot chroot "startx"
-		;;
-		xnest)
-		Echo_message "Pausing build: starting interactive Xnest..."
-			#Chroot chroot "" # FIXME
-		;;
-esac
-
-# Creating stage file
-Create_stagefile .stage/chroot_symlinks
diff --git a/helpers/chroot_linux-image b/helpers/chroot_linux-image
deleted file mode 100755
index c7e6abd..0000000
--- a/helpers/chroot_linux-image
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_linux-image(1) - manage /etc/kernel-img.conf
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'manage /etc/kernel-img.conf')"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-case "${1}" in
-	install)
-		Echo_message "Configuring file /etc/kernel-img.conf"
-
-		# Checking stage file
-		Check_stagefile .stage/chroot_linux-image
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		if [ -f chroot/etc/kernel-img.conf ]
-		then
-			# Saving kernel-img.conf
-			cp chroot/etc/kernel-img.conf chroot/etc/kernel-img.conf.old
-		fi
-
-		# Configuring kernel-img.conf
-cat >> chroot/etc/kernel-img.conf << EOF
-do_bootloader = No
-do_initrd = Yes
-warn_initrd = No
-EOF
-
-		# Diverting update-initramfs
-		#if [ "${LH_INITRAMFS}" = "live-initramfs" ]
-		#then
-		#	mv chroot/usr/sbin/update-initramfs chroot/usr/sbin/update-initramfs.live-helper
-		#fi
-
-		if [ "${LH_LINUX_PACKAGES}" != "none" ]
-		then
-			for FLAVOUR in ${LH_LINUX_FLAVOURS}
-			do
-				for PACKAGE in ${LH_LINUX_PACKAGES}
-				do
-					echo ${PACKAGE}-${FLAVOUR} >> chroot/root/chroot_packages
-				done
-			done
-		fi
-
-		# Queue installation of linux-image and ${LH_INITRAMFS}
-		if [ "${LH_INITRAMFS}" != "none" ]
-		then
-			echo ${LH_INITRAMFS} >> chroot/root/chroot_packages
-		fi
-
-		# Creating stage file
-		Create_stagefile .stage/chroot_linux-image
-		;;
-
-	remove)
-		Echo_message "Deconfiguring file /etc/kernel-img.conf"
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		if [ -f chroot/etc/kernel-img.conf.old ]
-		then
-			# Restoring kernel-img.conf file
-			mv chroot/etc/kernel-img.conf.old chroot/etc/kernel-img.conf
-		else
-			# Removing kernel-img.conf file
-			Truncate chroot/etc/kernel-img.conf
-		fi
-
-		# Removing stage file
-		rm -f .stage/chroot_linux-image
-		;;
-
-	*)
-		Usage
-		;;
-esac
diff --git a/helpers/chroot_local-hooks b/helpers/chroot_local-hooks
deleted file mode 100755
index b871625..0000000
--- a/helpers/chroot_local-hooks
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_local-hooks(1) - execute local hooks in chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'execute local hooks in chroot')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin executing local hooks..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_local-hooks
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Processing local-hooks
-if Find_files config/chroot_local-hooks/*
-then
-	# Restoring cache
-	Restore_cache cache/packages_chroot
-
-	for HOOK in config/chroot_local-hooks/*
-	do
-		# Copying hook
-		cp "${HOOK}" chroot/root
-
-		# Making hook executable
-		if [ ! -x chroot/root/"$(basename ${HOOK})" ]
-		then
-			chmod +x chroot/root/"$(basename ${HOOK})"
-		fi
-
-		# Executing hook
-		Chroot chroot "/root/$(basename ${HOOK})" || ( Echo_error "${HOOK} failed (exit non-zero). You should check for errors."; exit 1 )
-
-		# Removing hook
-		rm -f chroot/root/"$(basename ${HOOK})"
-	done
-
-	# Saving cache
-	Save_cache cache/packages_chroot
-
-	# Creating stage file
-	Create_stagefile .stage/chroot_local-hooks
-fi
diff --git a/helpers/chroot_local-includes b/helpers/chroot_local-includes
deleted file mode 100755
index a90ffe7..0000000
--- a/helpers/chroot_local-includes
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_local-includes(1) - copy local files into chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'copy local files into chroot')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin copying chroot local includes..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_local-includes
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if Find_files config/chroot_local-includes/
-then
-	# Copying includes
-	cd config/chroot_local-includes
-	find . | cpio -dmpu --no-preserve-owner "${OLDPWD}"/chroot
-	cd "${OLDPWD}"
-
-	# Creating stage file
-	Create_stagefile .stage/chroot_local-includes
-fi
diff --git a/helpers/chroot_local-packages b/helpers/chroot_local-packages
deleted file mode 100755
index 2814d03..0000000
--- a/helpers/chroot_local-packages
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_local-packages(1) - queue install of local packages into chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'queue install of local packages into chroot')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin queueing installation of local packages..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_local-packages
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if Find_files chroot/root/local-packages/*.deb
-then
-	gunzip < chroot/root/local-packages/Packages.gz | awk '/^Package: / { print $2 }' \
-		>> chroot/root/chroot_packages
-
-	# Creating stage file
-	Create_stagefile .stage/chroot_local-packages
-fi
diff --git a/helpers/chroot_local-packageslists b/helpers/chroot_local-packageslists
deleted file mode 100755
index 3ad2b3d..0000000
--- a/helpers/chroot_local-packageslists
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_local-packageslists(1) - queue install of local packages lists into chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'queue install of local packages lists into chroot')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin queueing installation of local packages lists..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_local-packageslists
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if ls config/chroot_local-packageslists/*.list > /dev/null 2>&1
-then
-	for LIST in config/chroot_local-packageslists/*.list
-	do
-		# Generating local package list
-		Expand_packagelist "$(basename ${LIST})" "config/chroot_local-packageslists" \
-			>> chroot/root/chroot_packages
-	done
-
-	# Creating stage file
-	Create_stagefile .stage/chroot_local-packageslists
-fi
diff --git a/helpers/chroot_local-patches b/helpers/chroot_local-patches
deleted file mode 100755
index db66019..0000000
--- a/helpers/chroot_local-patches
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_local-patches(1) - apply local patches against chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'apply local patches against chroot')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin applying chroot local patches..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_local-patches
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if Find_files config/chroot_local-patches/
-then
-	# Restoring cache
-	Restore_cache cache/packages_chroot
-
-	# Checking depends
-	Check_package chroot/usr/bin/patch patch
-
-	# Installing depends
-	Install_package
-
-	for PATCH in config/chroot_local-patches/*
-	do
-		Echo_message "Applying patch %s..." "${PATCH}"
-		Chroot chroot "patch -p1" < ${PATCH}
-	done
-
-	# Removing depends
-	Remove_package
-
-	# Saving cache
-	Save_cache cache/packages_chroot
-
-	# Creating stage file
-	Create_stagefile .stage/chroot_local-patches
-fi
diff --git a/helpers/chroot_local-preseed b/helpers/chroot_local-preseed
deleted file mode 100755
index d642f76..0000000
--- a/helpers/chroot_local-preseed
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_local-preseed(1) - use debconf local preseeding file
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'execute local preseed in chroot')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin executing local preseeds..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_local-preseed
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if Find_files config/chroot_local-preseed/*
-then
-	# Check dependency
-	Check_package chroot/usr/bin/debconf-set-selections debconf
-
-	# Install dependency
-	Install_package
-
-	for PRESEED in config/chroot_local-preseed/*
-	do
-		# Copying local preseed
-		cp "${PRESEED}" chroot/root/preseed
-
-		Chroot chroot "debconf-set-selections /root/preseed"
-
-		# Removing local preseed file
-		rm -f chroot/root/preseed
-	done
-
-	# Remove dependency
-	Remove_package
-
-	# Creating stage file
-	Create_stagefile .stage/chroot_local-preseed
-fi
diff --git a/helpers/chroot_localization b/helpers/chroot_localization
deleted file mode 100755
index c637aac..0000000
--- a/helpers/chroot_localization
+++ /dev/null
@@ -1,659 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_localization(1) - install localization packages into chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'install localization packages into chroot')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin installing localization packages..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_localization
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Setting localizations
-if [ -n "${LH_LANGUAGE}" ]
-then
-	case "${LH_LANGUAGE}" in
-		af)
-			# Afrikaans
-			LOCALIZATIONS="iceweasel kde openoffice"
-			;;
-
-		as-in)
-			# Assamese
-			LOCALIZATIONS="openoffice"
-			;;
-
-		ar)
-			# Arabic
-			LOCALIZATIONS="iceweasel kde openoffice"
-			;;
-
-		az)
-			# Azerbaijani
-			LOCALIZATIONS="kde"
-			;;
-
-		be)
-			# Belarusian
-			LOCALIZATIONS="iceape iceweasel openoffice"
-
-			# Overrides
-			OPENOFFICE="be-by"
-			;;
-
-		bg)
-			# Bulgarian
-			LOCALIZATIONS="icedove iceweasel kde openoffice"
-			;;
-
-		bn)
-			# Bengali
-			LOCALIZATIONS="kde openoffice"
-			;;
-
-		br)
-			# Breton
-			LOCALIZATIONS="kde openoffice"
-			;;
-
-		bs)
-			# Bosnian
-			LOCALIZATION="kde openoffice"
-			;;
-
-		ca)
-			# Catalan
-			LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
-			;;
-
-		cs)
-			# Czech
-			LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
-			;;
-
-		cy-gb)
-			# Welsh
-			LOCALIZATIONS="iceweasel kde koffice openoffice"
-
-			# Overrides
-			KDE="cy"
-			KOFFICE="cy"
-			OPENOFFICE="cy"
-			;;
-
-		da)
-			# Danish
-			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-			;;
-
-		de)
-			# German
-			LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
-			;;
-
-		dz-bt)
-			# Dzongkha
-			LOCALIZATIONS="iceweasel openoffice"
-
-			# Overrides
-			OPENOFFICE="dz"
-			;;
-
-		el)
-			# Greek
-			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-			;;
-
-		en-gb)
-			# English (Great Britain)
-			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-
-			# Overrides
-			KDE="engb"
-			KOFFICE="engb"
-			;;
-
-		en-za)
-			# English (South Africa)
-			LOCALIZATIONS="openoffice"
-			;;
-
-		eo)
-			# Esperanto
-			LOCALIZATIONS="kde openoffice"
-			;;
-
-		es-ar)
-			# Spanish (Argentina)
-			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-
-			# Overrides
-			KDE="es"
-			KOFFICE="es"
-			OPENOFFICE="es"
-			;;
-
-		es-es)
-			# Spanish (Spain)
-			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-
-			# Overrides
-			KDE="es"
-			KOFFICE="es"
-			OPENOFFICE="es"
-			;;
-
-		et-ee)
-			# Estonian
-			LOCALIZATIONS="iceweasel kde koffice openoffice"
-
-			# Overrides
-			KDE="et"
-			KOFFICE="et"
-			OPENOFFICE="et"
-			;;
-
-		eu)
-			# Basque
-			LOCALIZATIONS="icedove iceweasel kde koffice"
-			;;
-
-		fa-ir)
-			# Persian
-			LOCALIZATIONS="iceweasel kde openoffice"
-
-			# Overrides
-			KDE="fa"
-			OPENOFFICE="fa"
-			;;
-
-		fi)
-			# Finnish
-			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-			;;
-
-		fr)
-			# French
-			LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
-			;;
-
-		fur-it)
-			# Furlan
-			LOCALIZATIONS="iceweasel"
-			;;
-
-		fy-nl)
-			# Frisian
-			LOCALIZATIONS="iceweasel kde"
-
-			# Overrides
-			KDE="fy"
-			;;
-
-		ga-ie)
-			# Irish (Ireland)
-			LOCALIZATIONS="icedove iceweasel kde openoffice"
-
-			# Overrides
-			ICEDOVE="ga"
-			KDE="ga"
-			OPENOFFICE="ga"
-			;;
-
-		gl)
-			# Galician
-			LOCALIZATIONS="kde"
-			;;
-
-		gu-in)
-			# Gujarati (India)
-			LOCALIZATIONS="icedove iceweasel openoffice"
-
-			# Overrides
-			ICEDOVE="gu"
-			;;
-
-		he)
-			# Hebrew
-			LOCALIZATIONS="iceape icedove iceweasel kde openoffice"
-			;;
-
-		hi)
-			# Hindi
-			LOCALIZATIONS="kde openoffice"
-			;;
-
-		hr)
-			# Croatian
-			LOCALIZATIONS="kde koffice openoffice"
-			;;
-
-		hu)
-			# Hungarian
-			LOCALIZATIONS="icedove iceweasel kde openoffice"
-			;;
-
-		in)
-			# Indic
-			LOCALIZATIONS="openoffice"
-			;;
-
-		is)
-			# Icelandic
-			LOCALIZATIONS="kde"
-			;;
-
-		it)
-			# Italian
-			LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
-			;;
-
-		ja)
-			# Japanese
-			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-			;;
-
-		ka)
-			# Georgian
-			LOCALIZATIONS="iceweasel openoffice"
-			;;
-
-		km)
-			# Khmer
-			LOCALIZATIONS="kde openoffice"
-			;;
-
-		ko)
-			# Korean
-			LOCALIZATIONS="icedove iceweasel kde openoffice"
-			;;
-
-		ku)
-			# Kurdish
-			LOCALIZATIONS="iceweasel openoffice"
-			;;
-
-		lo)
-			# Lao
-			LOCALIZATIONS="openoffice"
-			;;
-
-		lt)
-			# Lithuanian
-			LOCALIZATIONS="icedove iceweasel kde openoffice"
-			;;
-
-		lv)
-			# Latvian
-			LOCALIZATIONS="kde koffice openoffice"
-			;;
-
-		mk)
-			# Macedonian
-			LOCALIZATIONS="icedove iceweasel kde openoffice"
-			;;
-
-		ml-in)
-			# Malayalam
-			LOCALIZATIONS="openoffice"
-			;;
-
-		mn)
-			# Mongolian
-			LOCALIZATIONS="iceweasel kde"
-			;;
-
-		ms)
-			# Malay
-			LOCALIZATIONS="kde koffice"
-			;;
-
-		nb-no)
-			# Bokmaal (Norway)
-			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-
-			# Overrides
-			ICEDOVE="nb"
-			KDE="nb"
-			KOFFICE="nb"
-			OPENOFFICE="nb"
-			;;
-
-		nds)
-			# Low Saxon
-			LOCALIZATIONS="kde"
-			;;
-
-		ne)
-			# Nepalese
-			LOCALIZATIONS="openoffice"
-			;;
-
-		nl)
-			# Dutch
-			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-			;;
-
-		nn-no)
-			# Nynorsk (Norway)
-			LOCALIZATIONS="iceweasel kde openoffice"
-
-			# Overrides
-			KDE="nn"
-			OPENOFFICE="nn"
-			;;
-
-		nr)
-			# Ndebele
-			LOCALIZATIONS="openoffice"
-			;;
-
-		ns)
-			# Northernsotho
-			LOCALIZATIONS="openoffice"
-			;;
-
-		or-in)
-			# Oriya
-			LOCALIZATIONS="openoffice"
-			;;
-
-		pa-in)
-			# Punjabi (India)
-			LOCALIZATIONS="icedove iceweasel kde openoffice"
-
-			# Overrides
-			ICEDOVE="pa"
-			KDE="pa"
-			;;
-
-		pl)
-			# Polish
-			LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
-			;;
-
-		pt-br)
-			# Portugese (Brazil)
-			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-
-			# Overrides
-			KDE="ptbr"
-			KOFFICE="ptbr"
-			;;
-
-		pt-pt)
-			# Portugese (Portugal)
-			LOCALIZATIONS="iceweasel kde koffice openoffice"
-
-			# Overrides
-			KDE="pt"
-			KOFFICE="pt"
-			OPENOFFICE="pt"
-			;;
-
-		ro)
-			# Romanian
-			LOCALIZATIONS="iceweasel kde"
-			;;
-
-		roa-es-val)
-			# Valencian (Spain)
-			LOCALIZATIONS="iceweasel"
-			;;
-
-		ru)
-			# Russian
-			LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
-			;;
-
-		rw)
-			# Kinarwanda
-			LOCALIZATIONS="kde openoffice"
-			;;
-
-		se)
-			# Northern Sami
-			LOCALIZATIONS="kde"
-			;;
-
-		sk)
-			# Slovak
-			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-			;;
-
-		sl)
-			# Slovenian
-			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-			;;
-
-		sr-cs)
-			# Serbian
-			LOCALIZATIONS="kde koffice openoffice"
-
-			# Overrides
-			KDE="sr"
-			KOFFICE="sr"
-			;;
-
-		sr-latin)
-			# Latin Serbian
-			LOCALIZATIONS="kde koffice"
-
-			# Overrides
-			KDE="srlatin"
-			KOFFICE="srlatin"
-			;;
-
-		ss)
-			# Swazi
-			LOCALIZATIONS="kde openoffice"
-			;;
-
-		st)
-			# Southern_sotho
-			LOCALIZATIONS="openoffice"
-			;;
-
-		sv-se)
-			# Swedish
-			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-
-			# Overrides
-			ICEDOVE="sv"
-			KDE="sv"
-			KOFFICE="sv"
-			OPENOFFICE="sv"
-			;;
-
-		ta-in)
-			# Tamil
-			LOCALIZATIONS="kde openoffice"
-
-			# Overrides
-			KDE="ta"
-			;;
-
-		te-in)
-			# Telugu
-			LOCALIZATIONS="openoffice"
-			;;
-
-		tg)
-			# Tajik
-			LOCALIZATIONS="kde openoffice"
-			;;
-
-		th)
-			# Thai
-			LOCALIZATIONS="openoffice"
-			;;
-
-		tn)
-			# Tswana
-			LOCALIZATIONS="openoffice"
-			;;
-
-		tr)
-			# Turkish
-			LOCALIZATIONS="icedove iceweasel kde kofffice openoffice"
-			;;
-
-		ts)
-			# Tsonga
-			LOCALIZATIONS="openoffice"
-			;;
-
-		uk-ua)
-			# Ukrainian
-			LOCALIZATIONS="icedove iceweasel kde kofffice openoffice"
-
-			# Overrides
-			ICEDOVE="uk"
-			KDE="uk"
-			KDE="uk"
-			OPENOFFICE="uk"
-			;;
-
-		uz)
-			# Uzbek
-			LOCALIZATIONS="kde"
-			;;
-
-		ve)
-			# Venda
-			LOCALIZATIONS="openoffice"
-			;;
-
-		vi)
-			# Vietnamese
-			LOCALIZATIONS="openoffice"
-			;;
-
-		xh)
-			# Xhosa
-			LOCALIZATIONS="openoffice"
-			;;
-
-		za)
-			# South African
-			LOCALIZATIONS="openoffice"
-			;;
-
-		zh-cn)
-			# Chinese (China)
-			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
-
-			# Overrides
-			KDE="zhcn"
-			KOFFICE="zhcn"
-			;;
-
-		zh-tw)
-			# Chinese (Taiwan)
-			LOCALIZATIONS="iceweasel kde koffice openoffice"
-
-			# Overrides
-			KDE="zhtw"
-			KOFFICE="zhtw"
-			;;
-
-		zu)
-			# Zulu
-			LOCALIZATIONS="openoffice"
-			;;
-	esac
-
-	# Setting languages
-	ICEAPE="${ICEAPE:-$LH_LANGUAGE}"
-	ICEDOVE="${ICEDOVE:-$LH_LANGUAGE}"
-	ICEWEASEL="${ICEWEASEL:-$LH_LANGUAGE}"
-	KDE="${KDE:-$LH_LANGUAGE}"
-	KOFFICE="${KOFFICE:-$LH_LANGUAGE}"
-	OPENOFFICE="${OPENOFFICE:-$LH_LANGUAGE}"
-
-	# Setting packages
-	for LOCALIZATION in ${LOCALIZATIONS}
-	do
-		case "${LOCALIZATION}" in
-			iceape)
-				Check_installed chroot/usr/bin/iceape iceape; [ $INSTALL_STATUS -eq 0 ] && Check_package "" iceweasel-l10n-"${ICEAPE}"
-				;;
-
-			icedove)
-				Check_installed chroot/usr/bin/icedove icedove
-				if [ $INSTALL_STATUS -eq 0 ]
-				then
-					if [ "${LH_DISTRIBUTION}" = lenny ]
-					then
-						Check_package "" icedove-locale-"${ICEDOVE}"
-					else
-						Check_package "" icedove-l10n-"${ICEDOVE}"
-					fi
-				fi
-				;;
-
-			iceweasel)
-				Check_installed chroot/usr/bin/iceweasel iceweasel; [ $INSTALL_STATUS -eq 0 ] && Check_package "" iceweasel-l10n-"${ICEWEASEL}"
-				;;
-
-			kde)
-				Check_installed chroot/usr/bin/kstart kdebase-bin; [ $INSTALL_STATUS -eq 0 ] && Check_package "" kde-i18n-"${KDE}"
-				;;
-
-			koffice)
-				Check_installed chroot/usr/bin/koconverter koffice; [ $INSTALL_STATUS -eq 0 ] && Check_package "" koffice-i18n-"${KOFFICE}"
-				;;
-
-			openoffice)
-				Check_installed chroot/usr/bin/ooffice openoffice.org-common; [ $INSTALL_STATUS -eq 0 ] && Check_package "" openoffice.org-l10n-"${OPENOFFICE}"
-				;;
-		esac
-	done
-
-	if [ "${LH_DISTRIBUTION}" = "lenny" ]
-	then
-		Check_installed chroot/usr/bin/gwenview gwenview; [ $INSTALL_STATUS -eq 0 ] && Check_package "" gwenview-i18n
-	fi
-
-	Check_installed chroot/usr/bin/k3b k3b; [ $INSTALL_STATUS -eq 0 ] && Check_package "" k3b-i18n
-
-	# Restoring cache
-	Restore_cache cache/packages_chroot
-
-	# Installing packages
-	Install_package
-
-	# Saving cache
-	Save_cache cache/packages_chroot
-
-	# Creating stage file
-	Create_stagefile .stage/chroot_localization
-fi
diff --git a/helpers/chroot_packages b/helpers/chroot_packages
deleted file mode 100755
index 745b132..0000000
--- a/helpers/chroot_packages
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_packages(1) - queue install of packages into chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'queue install of packages into chroot')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin queueing installation of packages..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_packages
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ -n "${LH_PACKAGES}" ] && [ "${LH_PACKAGES}" != "none" ]
-then
-	echo ${LH_PACKAGES} >> chroot/root/chroot_packages
-
-	# Creating stage file
-	Create_stagefile .stage/chroot_packages
-fi
diff --git a/helpers/chroot_packageslists b/helpers/chroot_packageslists
deleted file mode 100755
index d1744e5..0000000
--- a/helpers/chroot_packageslists
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_packageslists(1) - queue install of packages lists into chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'queue install of packages lists into chroot')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin queueing installation of packages lists..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_packageslists
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ -n "${LH_PACKAGES_LISTS}" ] && [ "${LH_PACKAGES_LISTS}" != "none" ]
-then
-
-	for LIST in ${LH_PACKAGES_LISTS}
-	do
-		# Generating package list
-		Expand_packagelist "${LIST}" >> chroot/root/chroot_packages
-	done
-
-	# Creating stage file
-	Create_stagefile .stage/chroot_packageslists
-fi
diff --git a/helpers/chroot_preseed b/helpers/chroot_preseed
deleted file mode 100755
index 47c3905..0000000
--- a/helpers/chroot_preseed
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_preseed(1) - use debconf preseeding file
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'execute preseed in chroot')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin executing preseed..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_preseed
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Processing preseeds
-for PRESEED in ${LH_PACKAGES_LISTS} ${LH_TASKS}
-do
-	if [ -f ${LH_BASE:-/usr/share/live-helper}/preseed/"${PRESEED}" ]
-	then
-		# Check dependency
-		Check_package chroot/usr/bin/debconf-set-selections debconf
-
-		# Install dependency
-		Install_package
-
-		# Copying preseed
-		cp "${PRESEED}" chroot/root/preseed
-
-		Chroot chroot "debconf-set-selections /root/preseed"
-
-		# Removing preseed file
-		rm -f chroot/root/preseed
-
-		# Remove dependency
-		Remove_package
-
-		# Creating stage file
-		Create_stagefile .stage/chroot_preseed
-	fi
-done
diff --git a/helpers/chroot_proc b/helpers/chroot_proc
deleted file mode 100755
index 8cbf11f..0000000
--- a/helpers/chroot_proc
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_proc(1) - mount /proc
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'mount /proc')"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Ensure that a system is built as root
-lh testroot
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-case "${1}" in
-	install)
-		Echo_message "Begin mounting /proc..."
-
-		# Checking stage file
-		Check_stagefile .stage/chroot_proc
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		if [ "${LH_USE_FAKEROOT}" != "true" ]
-		then
-			# Creating mountpoint
-			mkdir -p chroot/proc
-
-			# Mounting /proc
-			${LH_ROOT_COMMAND} mount proc-live -t proc chroot/proc
-		else
-			rm -rf chroot/proc
-			ln -s /proc chroot/
-		fi
-
-		# Creating stage file
-		Create_stagefile .stage/chroot_proc
-		;;
-
-	remove)
-		Echo_message "Begin unmounting /proc..."
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		if [ "${LH_USE_FAKEROOT}" != "true" ]
-		then
-			# Workaround binfmt-support /proc locking
-			if [ -e chroot/proc/sys/fs/binfmt_misc/status ]
-			then
-				${LH_ROOT_COMMAND} umount chroot/proc/sys/fs/binfmt_misc
-			fi
-
-			# Unmounting /proc
-			#fuser -km chroot/proc
-			if [ -e chroot/proc/version ]
-			then
-				${LH_ROOT_COMMAND} umount chroot/proc
-			fi
-		else
-			rm -rf chroot/proc
-			mkdir -p chroot/proc
-		fi
-
-		# Removing stage file
-		rm -f .stage/chroot_proc
-		;;
-
-	*)
-		Usage
-		;;
-esac
diff --git a/helpers/chroot_resolv b/helpers/chroot_resolv
deleted file mode 100755
index 318bb1a..0000000
--- a/helpers/chroot_resolv
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_resolv(1) - manage /etc/resolv.conf
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'manage /etc/resolv.conf')"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-case "${1}" in
-	install)
-		Echo_message "Configuring file /etc/resolv.conf"
-
-		# Checking stage file
-		Check_stagefile .stage/chroot_resolv
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		if [ -e chroot/etc/resolv.conf ]
-		then
-			# Save resolv file or symlink
-			mv chroot/etc/resolv.conf chroot/etc/resolv.conf.orig
-
-			# Also truncate it, otherwise we'll end up with the one
-			# created by debootstrap in the final image.
-			#
-			# If you want to have a custom resolv.conf, please
-			# overwrite it with normal local_includes mechanism.
-			Truncate chroot/etc/resolv.conf.orig
-		fi
-
-		if [ -f /etc/resolv.conf ]
-		then
-			# Copy resolv file
-			cp /etc/resolv.conf chroot/etc/resolv.conf
-		fi
-
-		# Creating stage file
-		Create_stagefile .stage/chroot_resolv
-		;;
-
-	remove)
-		Echo_message "Deconfiguring file /etc/resolv.conf"
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		if [ -e config/chroot_local-includes/etc/resolv.conf ]
-		then
-			# Copying local resolv.conf
-			cp -a config/chroot_local-includes/etc/resolv.conf chroot/etc/resolv.conf
-			rm -f chroot/etc/resolv.conf.orig
-		elif [ -e chroot/etc/resolv.conf.orig ]
-		then
-			# Restoring resolv file or symlink
-			mv chroot/etc/resolv.conf.orig chroot/etc/resolv.conf
-		else
-			# Truncating resolv file
-			Truncate chroot/etc/resolv.conf
-		fi
-
-		# Removing stage file
-		rm -f .stage/chroot_resolv
-		;;
-
-	*)
-		Usage
-		;;
-esac
diff --git a/helpers/chroot_selinuxfs b/helpers/chroot_selinuxfs
deleted file mode 100755
index 64ce659..0000000
--- a/helpers/chroot_selinuxfs
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_sysfs(1) - mount /selinux
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'mount /selinux')"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Ensure that a system is built as root
-lh testroot
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-case "${1}" in
-	install)
-		if [ -e /selinux/enforce ] && [ "$(cat /selinux/enforce)" = "1" ]
-		then
-			Echo_message "Begin mounting /selinux..."
-
-			# Checking stage file
-			Check_stagefile .stage/chroot_selinuxfs
-
-			# Checking lock file
-			Check_lockfile .lock
-
-			# Creating lock file
-			Create_lockfile .lock
-
-			if [ "${LH_USE_FAKEROOT}" != "true" ]
-			then
-				# Create mountpoint
-				mkdir -p chroot/selinux
-
-				# Mounting /selinux
-				${LH_ROOT_COMMAND} mount selinuxfs-live -t selinuxfs chroot/selinux
-			else
-				rm -rf chroot/selinux
-				ln -s /selinux chroot/
-			fi
-
-			# Creating stage file
-			Create_stagefile .stage/chroot_selinuxfs
-		fi
-		;;
-
-	remove)
-		Echo_message "Begin unmounting /selinux..."
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		if [ "${LH_USE_FAKEROOT}" != "true" ]
-		then
-			# Unmounting /selinux
-			#fuser -km chroot/selinux
-			if [ -e chroot/selinux/enforce ]
-			then
-				${LH_ROOT_COMMAND} umount chroot/selinux
-			fi
-		else
-			if [ -e chroot/selinux ]
-			then
-				rm -rf chroot/selinux
-				mkdir -p chroot/selinux
-			fi
-		fi
-
-		# Removing stage file
-		rm -f .stage/chroot_selinux
-		;;
-
-	*)
-		Usage
-		;;
-esac
diff --git a/helpers/chroot_sources b/helpers/chroot_sources
deleted file mode 100755
index 413d2f5..0000000
--- a/helpers/chroot_sources
+++ /dev/null
@@ -1,608 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_sources(1) - manage /etc/apt/sources.list
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'manage /etc/apt/sources.list')"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-_LH_LOCAL_KEY_EMAIL="live-helper-local-key at invalid"
-
-case "${1}" in
-	install)
-		Echo_message "Configuring file /etc/apt/sources.list"
-
-		# Checking stage file
-		Check_stagefile .stage/chroot_sources
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		# Restoring cache
-		Restore_cache cache/packages_chroot
-
-		# Configure custom sources.list
-		echo "deb ${LH_MIRROR_CHROOT} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" > chroot/etc/apt/sources.list
-
-		if [ "${LH_SOURCE}" = "true" ]
-		then
-			echo "deb-src ${LH_MIRROR_CHROOT} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-		fi
-
-		if [ "${LH_SECURITY}" = "true" ]
-		then
-			case "${LH_MODE}" in
-				ubuntu)
-					echo "deb ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-
-					if [ "${LH_SOURCE}" = "true" ]
-					then
-						echo "deb-src ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-					fi
-					;;
-
-				*)
-					if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
-					then
-						echo "deb ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-
-						if [ "${LH_SOURCE}" = "true" ]
-						then
-							echo "deb-src ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-						fi
-					fi
-					;;
-			esac
-		fi
-
-		if [ "${LH_VOLATILE}" = "true" ]
-		then
-			case "${LH_MODE}" in
-				debian|debian-release)
-					if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
-					then
-						echo "deb ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-
-						if [ "${LH_SOURCE}" = "true" ]
-						then
-							echo "deb-src ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-						fi
-					fi
-					;;
-
-				ubuntu)
-					echo "deb ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}-updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-
-					if [ "${LH_SOURCE}" = "true" ]
-					then
-						echo "deb-src ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}-updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-					fi
-					;;
-			esac
-		fi
-
-		# Check local sources.list
-		if Find_files config/chroot_sources/*.chroot
-		then
-			# Deconfigure (possibly) old sources.list snipplets
-			if Find_files config/chroot_sources/*.binary
-			then
-				for FILE in config/chroot_sources/*.binary
-				do
-					rm -f "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary).list"
-				done
-			fi
-
-			# Configure new sources.list snipplets
-			for FILE in config/chroot_sources/*.chroot
-			do
-				cp "${FILE}" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot).list"
-			done
-		fi
-
-		# Configure third-party repositories
-		if [ -n "${LH_REPOSITORIES}" ]
-		then
-			for REPOSITORY in ${LH_REPOSITORIES}
-			do
-				for PLACE in config/repositories "${LH_BASE}/repositories"
-				do
-					# Prefer repositories from the config tree
-					# over the global ones.
-					if ! ls "${PLACE}/${REPOSITORY}"* > /dev/null 2>&1
-					then
-						continue
-					fi
-
-					# Adding sources.list entries (chroot)
-					if [ -e "${PLACE}/${REPOSITORY}.chroot" ]
-					then
-						sed -e "s|@DISTRIBUTION@|${LH_DISTRIBUTION}|g" \
-						    -e "s|@ARCHIVE_AREAS@|${LH_ARCHIVE_AREAS}|g" \
-						"${PLACE}/${REPOSITORY}.chroot" > \
-						"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
-					elif [ -e "${PLACE}/${REPOSITORY}" ]
-					then
-						sed -e "s|@DISTRIBUTION@|${LH_DISTRIBUTION}|g" \
-						    -e "s|@ARCHIVE_AREAS@|${LH_ARCHIVE_AREAS}|g" \
-						"${PLACE}/${REPOSITORY}" > \
-						"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
-					fi
-
-					if [ "${LH_APT_SECURE}" != false ]
-					then
-						# Adding archive signing keys (chroot)
-						if [ -e "${PLACE}/${REPOSITORY}.chroot.gpg" ]
-						then
-							cat "${PLACE}/${REPOSITORY}.chroot.gpg" | Chroot chroot "apt-key add -"
-						elif [ -e "${PLACE}/${REPOSITORY}.gpg" ]
-						then
-							cat "${PLACE}/${REPOSITORY}.gpg" | Chroot chroot "apt-key add -"
-						fi
-					fi
-				done
-			done
-		fi
-
-		# Configure local package repository
-		if Find_files config/chroot_local-packages/*.deb
-		then
-			rm -rf chroot/root/local-packages
-			mkdir -p chroot/root/local-packages
-
-			if [ "$(stat --printf %d config/chroot_local-packages)" = "$(stat --printf %d chroot/root/local-packages)" ]
-			then
-				CP_OPTIONS="-l"
-			fi
-
-			# Copy packages
-			if Find_files config/chroot_local-packages/*_"${LH_ARCHITECTURE}".deb
-			then
-				cp ${CP_OPTIONS} config/chroot_local-packages/*_"${LH_ARCHITECTURE}".deb chroot/root/local-packages
-			fi
-
-			if Find_files config/chroot_local-packages/*_all.deb
-			then
-				cp ${CP_OPTIONS} config/chroot_local-packages/*_all.deb chroot/root/local-packages
-			fi
-
-			if Find_files chroot/root/local-packages/*.deb
-			then
-				# If we bootstrapped a minimal chroot, we need
-				# to install apt-utils before we have have
-				# completed all the indices.
-				case "${LH_PACKAGES_LISTS}" in
-					stripped|minimal)
-						Chroot chroot "apt-get update"
-						;;
-				esac
-
-				# Check depends
-				Check_package chroot/usr/bin/apt-ftparchive apt-utils
-
-				# Installing depends
-				Install_package
-
-				# Generate Packages and Packages.gz 
-				echo "cd /root/local-packages && apt-ftparchive packages . > Packages" | Chroot chroot sh
-				gzip -9 -c chroot/root/local-packages/Packages > chroot/root/local-packages/Packages.gz
-
-				# Generate Release
-				echo "cd /root/local-packages && apt-ftparchive \
-					-o APT::FTPArchive::Release::Origin=chroot_local-packages \
-					release . > Release" | Chroot chroot sh
-
-				if [ "${LH_APT_SECURE}" = "true" ]
-				then
-					_LH_DOTGNUPG_EXISTED=0
-					if [ -d chroot/root/.gnupg ]
-					then
-						_LH_DOTGNUPG_EXISTED=1
-					fi
-
-					# Ensure ~/.gnupg exists (required for gnupg >= ~1.4.9)
-					mkdir -p chroot/root/.gnupg
-
-					# Temporarily replace /dev/random with /dev/urandom so as not
-					# to block automated image builds; we don't care about the
-					# security of this key anyway.
-					mv chroot/dev/random chroot/dev/random.orig
-					cp -a chroot/dev/urandom chroot/dev/random
-
-					if Find_files cache/local-package-keyring.*
-					then
-						cp cache/local-package-keyring.* chroot/root
-					else
-						# Generate temporary key
-						echo "Key-Type: RSA
-						      Key-Length: 1024
-						      Subkey-Type: ELG-E
-						      Subkey-Length: 1024
-						      Name-Real: live-helper local packages key
-						      Name-Email: ${_LH_LOCAL_KEY_EMAIL}
-						      Expire-Date: 0
-						      %secring /root/local-package-keyring.sec
-						      %pubring /root/local-package-keyring.pub
-						      %commit" | Chroot chroot "gpg --batch --gen-key" || _LH_RET=${?}
-
-						case "${_LH_RET}" in
-							""|2)
-								# Gnupg sometimes seems to return with a status of 2 when there was not
-								# enough entropy (and key creation blocks temporarily) even if the
-								# operation was ultimately successful.
-								;;
-							*)
-								Echo_error "GPG exited with error status %s" "${_LH_RET}"
-								exit ${_LH_RET}
-								;;
-						esac
-
-						# Save keyrings to avoid regeneration
-						cp chroot/root/local-package-keyring.* cache/
-					fi
-
-					# Sign release
-					Chroot chroot "gpg --no-default-keyring --secret-keyring /root/local-package-keyring.sec \
-						--keyring /root/local-package-keyring.pub -abs -o \
-						/root/local-packages/Release.gpg /root/local-packages/Release"
-
-					# Import key
-					Chroot chroot "gpg --no-default-keyring --secret-keyring /root/local-package-keyring.sec \
-						--keyring /root/local-package-keyring.pub --armor \
-						--export ${_LH_LOCAL_KEY_EMAIL}" | Chroot chroot "apt-key add -"
-
-					# Remove temporary keyrings
-					rm chroot/root/local-package-keyring.pub
-					rm chroot/root/local-package-keyring.sec
-
-					# Revert /dev/random
-					mv chroot/dev/random.orig chroot/dev/random
-
-					# Remove /root/.gnupg if we created it during the signing process
-					if [ "${_LH_DOTGNUPG_EXISTED}" -eq 0 ]
-					then
-						rm -rf chroot/root/.gnupg
-					fi
-				fi
-
-				# Add to sources.list.d
-				echo "deb file:/root/local-packages ./" > chroot/etc/apt/sources.list.d/local-packages.list
-
-				# Removing depends
-				Remove_package
-			else
-				Echo_warning "Local packages must be named with suffix '_all.deb' or '_\$architecture.deb'."
-			fi
-		fi
-
-		# Update indices from cache
-		if [ "${LH_CACHE_INDICES}" = "true" ] && [ -d cache/indices_bootstrap ]
-		then
-			if Find_files cache/indices_bootstrap/secring.gpg*
-			then
-				cp -f cache/indices_bootstrap/secring.gpg* chroot/etc/apt
-			fi
-
-			if Find_files cache/indices_bootstrap/trusted.gpg*
-			then
-				cp -rf cache/indices_bootstrap/trusted.gpg* chroot/etc/apt
-			fi
-
-			if [ -f cache/indices_bootstrap/pkgcache.bin ]
-			then
-				cp -f cache/indices_bootstrap/pkgcache.bin chroot/var/cache/apt
-			fi
-
-			if [ -f cache/indices_bootstrap/srcpkgcache.bin ]
-			then
-				cp -f cache/indices_bootstrap/srcpkgcache.bin chroot/var/cache/apt
-			fi
-
-			if Find_files cache/indices_bootstrap/*_Packages
-			then
-				cp -f cache/indices_bootstrap/*_Packages chroot/var/lib/apt/lists
-			fi
-
-			if Find_files cache/indices_bootstrap/*_Sources
-			then
-				cp -f cache/indices_bootstrap/*_Sources chroot/var/lib/apt/lists
-			fi
-
-			if Find_files cache/indices_bootstrap/*_Release*
-			then
-				cp -f cache/indices_bootstrap/*_Release* chroot/var/lib/apt/lists
-			fi
-
-			if [ "${LH_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ]
-			then
-				Chroot chroot "apt-get ${APT_OPTIONS} install aptitude"
-			fi
-		else # Get fresh indices
-			# Check local gpg keys
-			if Find_files config/chroot_sources/*.chroot.gpg
-			then
-				for FILE in config/chroot_sources/*.chroot.gpg
-				do
-					cp ${FILE} chroot/root
-					Chroot chroot "apt-key add /root/$(basename ${FILE})"
-					rm -f chroot/root/$(basename ${FILE})
-				done
-			fi
-
-			# Check local keyring packages
-			if Find_files config/chroot_sources/*.deb
-			then
-				for PACKAGE in config/chroot_sources/*.deb
-				do
-					cp ${PACKAGE} chroot/root
-					Chroot chroot "dpkg -i /root/$(basename ${PACKAGE})"
-					rm -f chroot/root/$(basename ${PACKAGE})
-				done
-			fi
-
-			# Installing aptitude
-			if [ "${LH_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ]
-			then
-				Chroot chroot "apt-get ${APT_OPTIONS} update"
-				Chroot chroot "apt-get ${APT_OPTIONS} install aptitude"
-			fi
-
-			Apt update
-			Apt upgrade
-			Apt dist-upgrade
-
-			# Installing keyring packages
-			if [ -n "${LH_KEYRING_PACKAGES}" ]
-			then
-				Chroot chroot "apt-get --yes --force-yes install ${LH_KEYRING_PACKAGES}"
-				Apt update
-			fi
-
-			if [ "${LH_CACHE_INDICES}" = "true" ]
-			then
-				mkdir -p cache/indices_bootstrap
-
-				cp -f chroot/etc/apt/secring.gpg* cache/indices_bootstrap
-				cp -rf chroot/etc/apt/trusted.gpg* cache/indices_bootstrap
-
-				cp -f chroot/var/cache/apt/pkgcache.bin cache/indices_bootstrap
-
-				if Find_files chroot/var/cache/apt/srcpkgcache.bin
-				then
-					cp -f chroot/var/cache/apt/srcpkgcache.bin cache/indices_bootstrap
-				fi
-
-				cp -f chroot/var/lib/apt/lists/*_Packages cache/indices_bootstrap
-
-				if Find_files chroot/var/lib/apt/lists/*_Sources
-				then
-					cp -f chroot/var/lib/apt/lists/*_Sources cache/indices_bootstrap
-				fi
-
-				cp -f chroot/var/lib/apt/lists/*_Release* cache/indices_bootstrap
-			fi
-		fi
-
-		# Saving cache
-		Save_cache cache/packages_chroot
-
-		# Creating stage file
-		Create_stagefile .stage/chroot_sources
-		;;
-
-	remove)
-		Echo_message "Deconfiguring file /etc/apt/sources.list"
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		# Configure generic indices
-		# Don't do anything if it's not required
-		if [ "${LH_MIRROR_CHROOT}" = "${LH_MIRROR_BINARY}" ] && \
-		[ "${LH_MIRROR_CHROOT_SECURITY}" = "${LH_MIRROR_BINARY_SECURITY}" ] && \
-		[ ! -d chroot/root/local-packages ]
-		then
-			# Removing stage file
-			rm -f .stage/chroot_sources
-
-			exit 0
-		fi
-
-		# Cleaning apt list cache
-		rm -rf chroot/var/lib/apt/lists
-		mkdir -p chroot/var/lib/apt/lists/partial
-
-		echo "deb ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" > chroot/etc/apt/sources.list
-
-		if [ "${LH_SOURCE}" = "true" ]
-		then
-			echo "deb-src ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-		fi
-
-		if [ "${LH_SECURITY}" = "true" ]
-		then
-			case "${LH_MODE}" in
-				ubuntu)
-					echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-
-					if [ "${LH_SOURCE}" = "true" ]
-					then
-						echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-					fi
-					;;
-
-				*)
-					if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
-					then
-						echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-
-						if [ "${LH_SOURCE}" = "true" ]
-						then
-							echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-						fi
-					fi
-					;;
-			esac
-		fi
-
-		if [ "${LH_VOLATILE}" = "true" ]
-		then
-			case "${LH_MODE}" in
-				debian|debian-release)
-					if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
-					then
-						echo "deb ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-
-						if [ "${LH_SOURCE}" = "true" ]
-						then
-							echo "deb-src ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-						fi
-					fi
-					;;
-
-				ubuntu)
-					echo "deb ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}-updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-
-					if [ "${LH_SOURCE}" = "true" ]
-					then
-						echo "deb-src ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}-updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
-					fi
-					;;
-			esac
-		fi
-
-		# Configure third-party repositories
-		if [ -n "${LH_REPOSITORIES}" ]
-		then
-			for REPOSITORY in ${LH_REPOSITORIES}
-			do
-				# Removing sources.list entries (chroot)
-				rm -f "chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
-
-				for PLACE in config/repositories "${LH_BASE}/repositories"
-				do
-					# Prefer repositories from the config tree
-					# over the global ones.
-					if ! ls "${PLACE}/${REPOSITORY}"* > /dev/null 2>&1
-					then
-						continue
-					fi
-
-					# Adding sources.list entries (binary)
-					if [ -e "${PLACE}/${REPOSITORY}.binary" ]
-					then
-						sed -e "s|@DISTRIBUTION@|${LH_DISTRIBUTION}|g" \
-						    -e "s|@ARCHIVE_AREAS@|${LH_ARCHIVE_AREAS}|g" \
-						"${PLACE}/${REPOSITORY}.binary" > \
-						"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
-					elif [ -e "${PLACE}/${REPOSITORY}" ]
-					then
-						sed -e "s|@DISTRIBUTION@|${LH_DISTRIBUTION}|g" \
-						    -e "s|@ARCHIVE_AREAS@|${LH_ARCHIVE_AREAS}|g" \
-						"${PLACE}/${REPOSITORY}" > \
-						"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
-					fi
-
-					if [ "${LH_APT_SECURE}" != false ]
-					then
-						# Adding archive signing keys (binary)
-						if [ -e "${PLACE}/${REPOSITORY}.binary.gpg" ]
-						then
-							cat "${PLACE}/${REPOSITORY}.binary.gpg" | Chroot chroot "apt-key add -"
-						elif [ -e "${PLACE}/${REPOSITORY}.gpg" ]
-						then
-							cat "${PLACE}/${REPOSITORY}.gpg" | Chroot chroot "apt-key add -"
-						fi
-					fi
-				done
-			done
-		fi
-
-		# Check local sources.list
-		if Find_files config/chroot_sources/*.binary
-		then
-			# Deconfigure (possibly) old sources.list snipplets
-			if Find_files config/chroot_sources/*.chroot
-			then
-			for FILE in config/chroot_sources/*.chroot
-				do
-					rm -f "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot).list"
-				done
-			fi
-
-			# Configure new sources.list snipplets
-			for FILE in config/chroot_sources/*.binary
-			do
-				cp "${FILE}" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary).list"
-			done
-		fi
-
-		# Check local gpg keys
-		if Find_files config/chroot_sources/*.binary.gpg
-		then
-			for FILE in config/chroot_sources/*.binary.gpg
-			do
-				cp ${FILE} chroot/root
-				Chroot chroot "apt-key add /root/$(basename ${FILE})"
-				rm -f chroot/root/$(basename ${FILE})
-			done
-		fi
-
-		# Updating indices
-		Apt update
-
-		# Cleaning apt package cache
-		rm -rf chroot/var/cache/apt
-		mkdir -p chroot/var/cache/apt/archives/partial
-
-		# Cleaning apt package lists
-		if [ "${LH_BINARY_INDICES}" = "false" ]
-		then
-			rm -rf chroot/var/lib/apt/lists
-			mkdir -p chroot/var/lib/apt/lists/partial
-		fi
-
-		# Remove local package repository
-		rm -f chroot/etc/apt/sources.list.d/local-packages.list
-		rm -rf chroot/root/local-packages
-
-		# Remove local packages key if it exists
-		if apt-key list | grep -q ${_LH_LOCAL_KEY_EMAIL}
-		then
-			apt-key del ${_LH_LOCAL_KEY_EMAIL}
-		fi
-
-		# Removing stage file
-		rm -f .stage/chroot_sources
-		;;
-
-	*)
-		Usage
-		;;
-esac
diff --git a/helpers/chroot_symlinks b/helpers/chroot_symlinks
deleted file mode 100755
index 76a023c..0000000
--- a/helpers/chroot_symlinks
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_symlinks(1) - convert symlinks
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'convert symlinks')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_SYMLINKS}" != "true" ]
-then
-	exit 0
-fi
-
-Echo_message "Begin converting symlinks..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_symlinks
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Checking depends
-Check_package chroot/usr/bin/symlinks symlinks
-
-# Installing depends
-Install_package
-
-# Converting symlinks
-Chroot chroot "symlinks -c -r -s /"
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/chroot_symlinks
diff --git a/helpers/chroot_sysfs b/helpers/chroot_sysfs
deleted file mode 100755
index 7b629b7..0000000
--- a/helpers/chroot_sysfs
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_sysfs(1) - mount /sys
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'mount /sys')"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Ensure that a system is built as root
-lh testroot
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-case "${1}" in
-	install)
-		Echo_message "Begin mounting /sys..."
-
-		# Checking stage file
-		Check_stagefile .stage/chroot_sysfs
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		if [ "${LH_USE_FAKEROOT}" != "true" ]
-		then
-			# Create mountpoint
-			mkdir -p chroot/sys
-
-			# Mounting /sys
-			${LH_ROOT_COMMAND} mount sysfs-live -t sysfs chroot/sys
-		else
-			rm -rf chroot/sys
-			ln -s /sys chroot/
-		fi
-
-		# Creating stage file
-		Create_stagefile .stage/chroot_sysfs
-		;;
-
-	remove)
-		Echo_message "Begin unmounting /sys..."
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		if [ "${LH_USE_FAKEROOT}" != "true" ]
-		then
-			# Unmounting /sys
-			#fuser -km chroot/sys
-			if [ -e chroot/sys/class ]
-			then
-				${LH_ROOT_COMMAND} umount chroot/sys
-			fi
-		else
-			rm -rf chroot/sys
-			mkdir -p chroot/sys
-		fi
-
-		# Removing stage file
-		rm -f .stage/chroot_sysfs
-		;;
-
-	*)
-		Usage
-		;;
-esac
diff --git a/helpers/chroot_sysv-rc b/helpers/chroot_sysv-rc
deleted file mode 100755
index 0ec9228..0000000
--- a/helpers/chroot_sysv-rc
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_sysv-rc(1) - manage /usr/sbin/policy-rc.d
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'manage /usr/sbin/policy-rc.d')"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-case "${1}" in
-	install)
-		Echo_message "Configuring file /usr/sbin/policy-rc.d"
-
-		# Checking stage file
-		Check_stagefile .stage/chroot_sysv-rc
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		if [ -f chroot/usr/sbin/policy-rc.d ]
-		then
-			# Save policy-rc.d file
-			mv chroot/usr/sbin/policy-rc.d chroot/usr/sbin/policy-rc.d.orig
-		fi
-
-		# Create policy-rc.d file
-cat > chroot/usr/sbin/policy-rc.d << EOF
-#!/bin/sh
-echo "All runlevel operations denied by policy" >&2
-exit 101
-EOF
-
-		chmod 0755 chroot/usr/sbin/policy-rc.d
-
-		# Creating stage file
-		Create_stagefile .stage/chroot_sysv-rc
-		;;
-
-	remove)
-		Echo_message "Deconfiguring file /usr/sbin/policy-rc.d"
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		if [ -f chroot/usr/sbin/policy-rc.d.orig ]
-		then
-			# Restore policy-rc.d file
-			mv chroot/usr/sbin/policy-rc.d.orig chroot/usr/sbin/policy-rc.d
-		else
-			# Remove policy-rc.d file
-			rm -f chroot/usr/sbin/policy-rc.d
-		fi
-
-		# Removing stage file
-		rm -f .stage/chroot_sysv-rc
-		;;
-
-	*)
-		Usage
-		;;
-esac
diff --git a/helpers/chroot_sysvinit b/helpers/chroot_sysvinit
deleted file mode 100755
index 2557f2d..0000000
--- a/helpers/chroot_sysvinit
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_sysvinit(1) - configure sysvinit
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'configure sysvinit')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Configuring package sysvinit"
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_sysvinit
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LH_SYSVINIT}" = "true" ]
-then
-	# Disable all
-	for FILE in chroot/etc/init.d/*
-	do
-		Chroot chroot "update-rc.d -f $(basename ${FILE}) remove"
-	done
-
-	# Re-enable all required (taken from -f standard chroot)
-	for PACKAGE in ${LH_INITRAMFS} console-common cron dpkg ifupdown initscripts kbd klogd libc6 libdevmapper1.02 libselinux1 libsepol1 login makedev module-init-tools netbase openbsd-inetd procps sudo sysklogd udev util-linux
-	do
-		if [ -f chroot/var/lib/dpkg/info/${PACKAGE}.postinst ]
-		then
-			# Re-configure if existing
-			Chroot chroot "/var/lib/dpkg/info/${PACKAGE}.postinst configure"
-		fi
-	done
-
-	# Creating stage file
-	Create_stagefile .stage/chroot_sysvinit
-fi
diff --git a/helpers/chroot_tasks b/helpers/chroot_tasks
deleted file mode 100755
index b819165..0000000
--- a/helpers/chroot_tasks
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_tasks(1) - install tasks into chroot
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'install tasks into chroot')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Echo_message "Begin installing tasks..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/chroot_tasks
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ -n "${LH_TASKS}" ] && [ "${LH_TASKS}" != "none" ]
-then
-	# Restoring cache
-	Restore_cache cache/packages_chroot
-
-	# Checking depends
-	case "${LH_TASKSEL}" in
-		aptitude)
-			Check_package chroot/usr/bin/aptitude aptitude
-			;;
-
-		tasksel)
-			Check_package chroot/usr/bin/tasksel tasksel
-			;;
-	esac
-
-	# Installing depends
-	Install_package
-
-	# Installing tasks
-	case "${LH_TASKSEL}" in
-		aptitude)
-			Chroot chroot "aptitude ${APTITUDE_OPTIONS} install ${LH_TASKS}"
-			;;
-
-		tasksel)
-			for TASK in ${LH_TASKS}
-			do
-				Chroot chroot "tasksel --debconf-apt-progress --logstderr install ${TASK}"
-			done
-			;;
-	esac
-
-	# Removing depends
-	Remove_package
-
-	# Saving cache
-	Save_cache cache/packages_chroot
-
-	# Creating stage file
-	Create_stagefile .stage/chroot_tasks
-fi
diff --git a/helpers/chroot_upstart b/helpers/chroot_upstart
deleted file mode 100755
index 32ca18c..0000000
--- a/helpers/chroot_upstart
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/sh
-
-# lh_chroot_upstart(1) - manage /usr/sbin/initctl
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'manage /usr/sbin/initctl')"
-HELP=""
-USAGE="${PROGRAM} {install|remove} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-case "${1}" in
-	install)
-		Echo_message "Configuring file /usr/sbin/initctl"
-
-		# Checking stage file
-		Check_stagefile .stage/chroot_upstart
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		if [ -f chroot/usr/sbin/initctl ]
-		then
-			# Save initctl file
-			mv chroot/usr/sbin/initctl chroot/usr/sbin/initctl.orig
-		fi
-
-		# Create initctl file
-cat > chroot/usr/sbin/initctl << EOF
-#!/bin/sh
-echo "All runlevel operations denied by policy" >&2
-exit 101
-EOF
-
-		chmod 0755 chroot/usr/sbin/initctl
-
-		# Creating stage file
-		Create_stagefile .stage/chroot_upstart
-		;;
-
-	remove)
-		Echo_message "Deconfiguring file /usr/sbin/initctl"
-
-		# Checking lock file
-		Check_lockfile .lock
-
-		# Creating lock file
-		Create_lockfile .lock
-
-		if [ -f chroot/usr/sbin/initctl.orig ]
-		then
-			# Restore initctl file
-			mv chroot/usr/sbin/initctl.orig chroot/usr/sbin/initctl
-		else
-			# Remove initctl file
-			rm -f chroot/usr/sbin/initctl
-		fi
-
-		# Removing stage file
-		rm -f .stage/chroot_upstart
-		;;
-
-	*)
-		Usage
-		;;
-esac
diff --git a/helpers/clean b/helpers/clean
deleted file mode 100755
index 6cafc6d..0000000
--- a/helpers/clean
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/bin/sh
-
-# lh_clean(1) - clean up system build directories
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Read meta config
-if [ "${1}" != "noauto" ] && [ -x auto/clean ]
-then
-	Echo_message "Executing auto/clean script."
-	./auto/clean ${@}
-fi
-
-if [ "${1}" = "noauto" ]
-then
-	shift
-fi
-
-# Setting static variables
-DESCRIPTION="$(Echo 'clean up system build directories')"
-HELP=""
-USAGE="${PROGRAM} [--all] [--cache] [--chroot] [--binary] [--purge] [--remove] [--stage] [--source]"
-
-#Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Avoid cases were users accidentally nuke their config/binary
-if [ ! -d config ] && [ "$(basename ${PWD})" = "config" ]
-then
-	Echo_error "%s is not a good Debian Live working directory to clean." "${PWD}"
-	exit 1
-fi
-
-rm -f .lock
-
-if [ -z "${*}" ]
-then
-	ARGUMENTS="--all"
-else
-	ARGUMENTS="${@}"
-fi
-
-for ARGUMENT in ${ARGUMENTS}
-do
-	case "${ARGUMENT}" in
-		--all)
-			LH=1 "${0}" noauto --chroot
-			LH=1 "${0}" noauto --binary
-			LH=1 "${0}" noauto --stage
-			LH=1 "${0}" noauto --source
-
-			if [ -d auto ]
-			then
-				rmdir --ignore-fail-on-non-empty auto
-			fi
-			;;
-
-		--cache)
-			${LH_ROOT_COMMAND} rm -rf cache
-			;;
-
-		--chroot)
-			Echo_message "Cleaning chroot"
-			${LH_ROOT_COMMAND} umount -f chroot/sys > /dev/null 2>&1 || true
-			${LH_ROOT_COMMAND} umount -f chroot/proc/sys/fs/binfmt_misc > /dev/null 2>&1 || true
-			${LH_ROOT_COMMAND} umount -f chroot/proc > /dev/null 2>&1 || true
-			${LH_ROOT_COMMAND} umount -f chroot/lib/init/rw > /dev/null 2>&1 || true
-			${LH_ROOT_COMMAND} umount -f chroot/dev/shm > /dev/null 2>&1 || true
-			${LH_ROOT_COMMAND} umount -f chroot/dev/pts > /dev/null 2>&1 || true
-			${LH_ROOT_COMMAND} umount -f chroot/dev > /dev/null 2>&1 || true
-
-			${LH_ROOT_COMMAND} umount -f chroot/binary.tmp > /dev/null 2>&1 || true
-			${LH_ROOT_COMMAND} umount -f chroot/dev.tmp/pts > /dev/null 2>&1 || true
-
-			${LH_ROOT_COMMAND} rm -rf chroot chroot.tmp
-
-			rm -f .stage/chroot*
-			;;
-
-		--binary)
-			${LH_ROOT_COMMAND} umount -f binary.tmp > /dev/null 2>&1 || true
-			rm -rf binary.tmp binary.deb binary.udeb
-			rm -f binary*.iso
-			rm -f binary*.img
-			rm -f binary*.tar.gz
-			rm -f binary.sh
-			rm -f binary.list binary.packages md5sum.txt
-
-			rm -rf binary
-			rm -rf tftpboot
-
-			rm -f .stage/binary*
-			;;
-
-		--remove)
-			LH=1 "${0}" --all
-			rm -rf cache/packages_*
-			;;
-
-		--purge)
-			LH=1 "${0}" --all
-			LH=1 "${0}" --cache
-
-			if [ -e auto/config ]
-			then
-				rm -f .stage/config
-			fi
-			;;
-
-		--stage)
-			rm -rf .stage
-			;;
-
-		--source)
-			rm -f source*.iso
-			rm -f source*.img
-			rm -f source*.tar
-			rm -f source*.tar.gz
-			rm -f source.list
-			rm -f source-selection.txt
-
-			rm -rf source
-
-			rm -f .stage/source*
-			;;
-
-		-h|--help)
-			Help
-			;;
-
-		-u|--usage)
-			Usage
-			;;
-
-		-v|--version)
-			Version
-			;;
-
-		*)
-			Usage
-			exit 1
-			;;
-	esac
-done
diff --git a/helpers/config b/helpers/config
deleted file mode 100755
index 6ca0afd..0000000
--- a/helpers/config
+++ /dev/null
@@ -1,1358 +0,0 @@
-#!/bin/sh
-
-# lh_config(1) - create configuration for live-helper(7)
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Read meta config
-if [ "${1}" != "noauto" ] && [ -x auto/config ]
-then
-	Echo_message "Executing auto/config script."
-	./auto/config ${@}
-fi
-
-if [ "${1}" = "noauto" ]
-then
-	shift
-fi
-
-# Setting static variables
-SYSTEM_LH_CONFFILE="/etc/default/live-helper"
-DESCRIPTION="$(Echo 'create configuration for live-helper(7)')"
-USAGE="${PROGRAM} [--apt apt|aptitude]\n\
-\t    [--apt-ftp-proxy URL]\n\
-\t    [--apt-http-proxy URL]\n\
-\t    [--apt-pdiffs true|false]\n\
-\t    [--apt-options OPTION|\"OPTIONS\"]\n\
-\t    [--aptitude-options OPTION|\"OPTIONS\"]\n\
-\t    [--apt-pipeline FIXME]\n\
-\t    [--apt-recommends true|false]\n\
-\t    [--apt-secure true|false]\n\
-\t    [-a|--architecture ARCHITECTURE]\n\
-\t    [-b|--binary-images iso|net|tar|usb-hdd]\n\
-\t    [--binary-filesystem fat16|fat32]\n\
-\t    [--binary-indices true|false|none]\n\
-\t    [--bootappend-install PARAMETER|\"PARAMETERS\"]\n\
-\t    [--bootappend-live PARAMETER|\"PARAMETERS\"]\n\
-\t    [--bootloader grub|syslinux|yaboot]\n\
-\t    [--bootstrap cdebootstrap|cdebootstrap-static|debootstrap|copy]\n\
-\t    [--bootstrap-config FILE]\n\
-\t    [-f|--bootstrap-flavour minimal|standard]\n\
-\t    [--bootstrap-keyring PACKAGE]\n\
-\t    [--breakpoints]\n\
-\t    [--cache true|false]\n\
-\t    [--cache-indices true|false]\n\
-\t    [--cache-packages true|false]\n\
-\t    [--cache-stages STAGE|\"STAGES\"]\n\
-\t    [--checksums md5|sha1|sha256|none]\n\
-\t    [--build-with-chroot true|false]\n\
-\t    [--chroot-filesystem ext2|ext3|squashfs|plain|jffs2]\n\
-\t    [-c|--conffile FILE]\n\
-\t    [--clean\n\
-\t    [--debconf-frontend dialog|editor|noninteractive|readline]\n\
-\t    [--debconf-nowarnings true|false]\n\
-\t    [--debconf-priority low|medium|high|critical]\n\
-\t    [--debian-installer true|cdrom|netinst|netboot|businesscard|live|false]\n\
-\t    [--debian-installer-distribution CODENAME|daily]\n\
-\t    [--debian-installer-preseedfile FILE|URL]\n\
-\t    [--debian-installer-gui true|false]\n\
-\t    [--debug]\n\
-\t    [-d|--distribution CODENAME]\n\
-\t    [--dump]\n\
-\t    [-e|--encryption false|aes128|aes192|aes256]\n\
-\t    [--fdisk fdisk|fdisk.dist]\n\
-\t    [--force]\n\
-\t    [--grub-splash FILE]\n\
-\t    [--gzip-options OPTION|\"OPTIONS\"]\n\
-\t    [--hooks FILE]\n\
-\t    [--hostname NAME]\n\
-\t    [--ignore-system-defaults]\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\
-\t    [--iso-volume NAME]\n\
-\t    [--jffs2-eraseblock SIZE]\n\
-\t    [--keyring-packages PACKAGE|\"PACKAGES\"]\n\
-\t    [-l|--language LANGUAGE]\n\
-\t    [-k|--linux-flavours FLAVOUR|\"FLAVOURS\"]\n\
-\t    [--linux-packages \"PACKAGES\"]\n\
-\t    [--losetup losetup|losetup.orig]\n\
-\t    [--memtest memtest86+|memtest86]\n\
-\t    [-m|--mirror-bootstrap URL]\n\
-\t    [--mirror-chroot URL]\n\
-\t    [--mirror-chroot-security URL]\n\
-\t    [--mirror-chroot-volatile URL]\n\
-\t    [--mirror-binary URL]\n\
-\t    [--mirror-binary-security URL]\n\
-\t    [--mirror-binary-volatile URL]\n\
-\t    [--mirror-debian-installer URL]\n\
-\t    [--mode debian|emdebian]\n\
-\t    [--net-root-filesystem nfs|cfs]\n\
-\t    [--net-root-mountoptions OPTIONS]\n\
-\t    [--net-root-path PATH]\n\
-\t    [--net-root-server IP|HOSTNAME]\n\
-\t    [--net-cow-filesystem nfs|cfs]\n\
-\t    [--net-cow-mountoptions OPTIONS]\n\
-\t    [--net-cow-path PATH]\n\
-\t    [--net-cow-server IP|HOSTNAME]\n\
-\t    [--net-tarball bzip2|gzip|tar|none]\n\
-\t    [-p|--packages-lists FILE]\n\
-\t    [--packages PACKAGE|\"PACKAGES\"]\n\
-\t    [--quiet]\n\
-\t    [-r|--repositories REPOSITORY|\"REPOSITORIES\"]\n\
-\t    [--root-command sudo]\n\
-\t    [--use-fakeroot true|false]\n\
-\t    [--archive-areas ARCHIVE_AREA|\"ARCHIVE_AREAS\"]\n\
-\t    [--security true|false]\n\
-\t    [--source true|false]\n\
-\t    [-s|--source-images iso|net|tar|usb-hdd]\n\
-\t    [--symlinks true|false]\n\
-\t    [--syslinux-splash FILE]\n\
-\t    [--syslinux-timeout SECONDS]\n\
-\t    [--syslinux-menu true|false]\n\
-\t    [--sysvinit true|false]\n\
-\t    [--tasksel aptitude|tasksel]\n\
-\t    [--tasks TASK]\n\
-\t    [--templates PATH]\n\
-\t    [--virtual-root-size MB]\n\
-\t    [--volatile true|false]\n\
-\t    [--exposed-root true|false]\n\
-\t    [--username NAME]\n\
-\t    [--verbose]\n\
-\t    [--win32-loader true|false]"
-
-Local_arguments ()
-{
-	LONG_OPTIONS="apt:,apt-ftp-proxy:,apt-http-proxy:,apt-pdiffs:,apt-options:,aptitute-options:,
-		apt-pipeline:,apt-recommends:,apt-secure:,bootstrap:,cache:,cache-indices:,cache-packages:,
-		cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,dump,
-		initramfs:,fdisk:,losetup:,mode:,repositories:,root-command:,use-fakeroot:,tasksel:,includes:,
-		templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,clean,
-		distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-chroot-volatile:,mirror-binary:,
-		mirror-binary-security:,mirror-binary-volatile:,mirror-debian-installer:,archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:,
-		gzip-options:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,
-		packages:,packages-lists:,tasks:,security:,volatile:,symlinks:,sysvinit:,binary-filesystem:,binary-images:,
-		binary-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,build-with-chroot:,
-		debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:,debian-installer-gui:,
-		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:,
-		username:,win32-loader:,source:,source-images:,breakpoints,conffile:,debug,force,
-		help,ignore-system-defaults,quiet,usage,verbose,version"
-	# Remove spaces added by indentation
-	LONG_OPTIONS="$(echo ${LONG_OPTIONS} | tr -d ' ')"
-	ARGUMENTS="$(getopt --longoptions ${LONG_OPTIONS} --name=${PROGRAM} --options a:f:d:m:l:k:p:b:e:r:s:c:huv --shell sh -- "${@}")"
-
-	if [ "${?}" != "0" ]
-	then
-		Echo_error "terminating" >&2
-		exit 1
-	fi
-
-	eval set -- "${ARGUMENTS}"
-
-	while true
-	do
-		case "${1}" in
-			--dump)
-				# Dump version
-				if [ -x "$(which dpkg-query 2>/dev/null)" ]
-				then
-					VERSION_DPKG="$(dpkg-query -f='${Version}' --show live-helper)"
-				fi
-
-				Echo "%s: This is live-helper version %s" "${0}" "${VERSION_DPKG:-${VERSION}}"
-
-				# Dump conffile contents
-				Print_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-
-				# Dump contents of directories that contain text files
-				for DIRECTORY in config/binary_local-packageslists config/chroot_local-packageslists config/chroot_apt config/chroot_local-patches config/chroot_local-preseed config/binary_rootfs
-				do
-					if Find_files "${DIRECTORY}"
-					then
-						Echo_file "${DIRECTORY}"/*
-					fi
-				done
-
-				# Dump directory listings of all directories under config/
-				for DIRECTORY in $(find config/ -mindepth 1 -maxdepth 1 -type d)
-				do
-					if Find_files "${DIRECTORY}"
-					then
-						ls -lR "${DIRECTORY}" | while read LINE
-						do
-							echo "${DIRECTORY}: ${LINE}"
-						done
-					fi
-				done
-
-				exit 0
-				;;
-
-			--clean)
-				# Remove empty directories in config tree
-				if ls config/*/ > /dev/null 2>&1
-				then
-					rmdir --ignore-fail-on-non-empty config/*/
-				fi
-
-				if [ -d config ]
-				then
-					rmdir --ignore-fail-on-non-empty config
-				fi
-
-				if [ -d auto/functions ]
-				then
-					rmdir --ignore-fail-on-non-empty auto/functions
-				fi
-
-				if [ -d auto ]
-				then
-					rmdir --ignore-fail-on-non-empty auto
-				fi
-
-				exit 0
-				;;
-
-			# config/common
-			--apt)
-				LH_APT="${2}"
-				shift 2
-				;;
-
-			--apt-ftp-proxy)
-				LH_APT_FTP_PROXY="${2}"
-				shift 2
-				;;
-
-			--apt-http-proxy)
-				LH_APT_HTTP_PROXY="${2}"
-				shift 2
-				;;
-
-			--apt-pdiffs)
-				LH_APT_PDIFFS="${2}"
-				shift 2
-				;;
-			--apt-options)
-				APT_OPTIONS="${2}"
-				shift 2
-				;;
-
-			--aptitude-options)
-				LH_APTITUDE_OPTIONS="${2}"
-				shift 2
-				;;
-
-			--apt-pipeline)
-				LH_APT_PIPELINE="${2}"
-				shift 2
-				;;
-
-			--apt-recommends)
-				LH_APT_RECOMMENDS="${2}"
-				shift 2
-				;;
-
-			--apt-secure)
-				LH_APT_SECURE="${2}"
-				shift 2
-				;;
-
-			--bootstrap)
-				LH_BOOTSTRAP="${2}"
-				shift 2
-				;;
-
-			--cache)
-				LH_CACHE="${2}"
-				shift 2
-				;;
-
-			--cache-indices)
-				LH_CACHE_INDICES="${2}"
-				shift 2
-				;;
-
-			--cache-packages)
-				LH_CACHE_PACKAGES="${2}"
-				shift 2
-				;;
-
-			--cache-stages)
-				LH_CACHE_STAGES="${2}"
-				shift 2
-				;;
-
-			--debconf-frontend)
-				LH_DEBCONF_FRONTEND="${2}"
-				shift 2
-				;;
-
-			--debconf-nowarnings)
-				LH_DEBCONF_NOWARNINGS="${2}"
-				shift 2
-				;;
-
-			--debconf-priority)
-				LH_DEBCONF_PRIORITY="${2}"
-				shift 2
-				;;
-
-			--initramfs)
-				LH_INITRAMFS="${2}"
-				shift 2
-				;;
-
-			--fdisk)
-				LH_FDISK="${2}"
-				shift 2
-				;;
-
-			--losetup)
-				LH_LOSETUP="${2}"
-				shift 2
-				;;
-
-			--mode)
-				LH_MODE="${2}"
-				shift 2
-				;;
-
-			-r|--repositories)
-				LH_REPOSITORIES="${2}"
-				shift 2
-				;;
-
-			--root-command)
-				LH_ROOT_COMMAND="${2}"
-				shift 2
-				;;
-
-			--use-fakeroot)
-				LH_USE_FAKEROOT="${2}"
-				shift 2
-				;;
-
-			--tasksel)
-				LH_TASKSEL="${2}"
-				shift 2
-				;;
-
-			--includes)
-				LH_INCLUDES="${2}"
-				shift 2
-				;;
-
-			--templates)
-				LH_TEMPLATES="${2}"
-				shift 2
-				;;
-
-			-v|--version)
-				Version
-				shift
-				;;
-
-			# config/bootstrap
-			-a|--architecture)
-				LH_ARCHITECTURE="${2}"
-				shift 2
-				;;
-
-			--bootstrap-config)
-				LH_BOOTSTRAP_CONFIG="${2}"
-				shift 2
-				;;
-
-			-f|--bootstrap-flavour)
-				LH_BOOTSTRAP_FLAVOUR="${2}"
-				shift 2
-				;;
-
-			--bootstrap-keyring)
-				LH_BOOTSTRAP_KEYRING="${2}"
-				shift 2
-				;;
-
-			-d|--distribution)
-				LH_DISTRIBUTION="${2}"
-				BACKPORTS="false"
-				shift 2
-
-				case "${LH_DISTRIBUTION}" in
-					lenny-backports)
-						LH_DISTRIBUTION="lenny"
-						BACKPORTS="true"
-						;;
-				esac
-				;;
-
-			-m|--mirror-bootstrap)
-				LH_MIRROR_BOOTSTRAP="${2}"
-				shift 2
-				;;
-
-			--mirror-chroot)
-				LH_MIRROR_CHROOT="${2}"
-				shift 2
-				;;
-
-			--mirror-chroot-security)
-				LH_MIRROR_CHROOT_SECURITY="${2}"
-				shift 2
-				;;
-
-			--mirror-chroot-volatile)
-				LH_MIRROR_CHROOT_VOLATILE="${2}"
-				shift 2
-				;;
-
-			--mirror-binary)
-				LH_MIRROR_BINARY="${2}"
-				shift 2
-				;;
-
-			--mirror-binary-security)
-				LH_MIRROR_BINARY_SECURITY="${2}"
-				shift 2
-				;;
-
-			--mirror-binary-volatile)
-				LH_MIRROR_BINARY_VOLATILE="${2}"
-				shift 2
-				;;
-
-			--mirror-debian-installer)
-				LH_MIRROR_DEBIAN_INSTALLER="${2}"
-				shift 2
-				;;
-
-			--archive-areas)
-				LH_ARCHIVE_AREAS="${2}"
-				shift 2
-				;;
-
-			# config/chroot
-			--chroot-filesystem)
-				LH_CHROOT_FILESYSTEM="${2}"
-				shift 2
-				;;
-
-			--virtual-root-size)
-				LH_VIRTUAL_ROOT_SIZE="${2}"
-				shift 2
-				;;
-
-			--exposed-root)
-				LH_EXPOSED_ROOT="${2}"
-				shift 2
-				;;
-
-			--gzip-options)
-				GZIP_OPTIONS="${2}"
-				shift 2
-				;;
-
-			--hooks)
-				LH_HOOKS="${2}"
-				shift 2
-				;;
-
-			--interactive)
-				LH_INTERACTIVE="${2}"
-				shift 2
-				;;
-
-			--keyring-packages)
-				LH_KEYRING_PACKAGES="${2}"
-				shift 2
-				;;
-
-			-l|--language)
-				LH_LANGUAGE="${2}"
-				shift 2
-				;;
-
-			-k|--linux-flavours)
-				LH_LINUX_FLAVOURS="${2}"
-				shift 2
-				;;
-
-			--linux-packages)
-				LH_LINUX_PACKAGES="${2}"
-				shift 2
-				;;
-
-			--packages)
-				LH_PACKAGES="${2}"
-				shift 2
-				;;
-
-			-p|--packages-lists)
-				LH_PACKAGES_LISTS="${2}"
-				shift 2
-				;;
-
-			--tasks)
-				LH_TASKS="${2}"
-				shift 2
-				;;
-
-			--security)
-				LH_SECURITY="${2}"
-				shift 2
-				;;
-
-			--volatile)
-				LH_VOLATILE="${2}"
-				shift 2
-				;;
-
-			--symlinks)
-				LH_SYMLINKS="${2}"
-				shift 2
-				;;
-
-			--sysvinit)
-				LH_SYSVINIT="${2}"
-				shift 2
-				;;
-
-			# config/binary
-			--binary-filesystem)
-				LH_BINARY_FILESYSTEM="${2}"
-				shift 2
-				;;
-
-			-b|--binary-images)
-				LH_BINARY_IMAGES="${2}"
-				shift 2
-				;;
-
-			--binary-indices)
-				LH_BINARY_INDICES="${2}"
-				shift 2
-				;;
-
-			--bootappend-live)
-				LH_BOOTAPPEND_LIVE="${2}"
-				shift 2
-				;;
-
-			--bootappend-install)
-				LH_BOOTAPPEND_INSTALL="${2}"
-				shift 2
-				;;
-
-			--bootloader)
-				LH_BOOTLOADER="${2}"
-				shift 2
-				;;
-
-			--checksums)
-				LH_CHECKSUMS="${2}"
-				shift 2
-				;;
-
-			--build-with-chroot)
-				LH_BUILD_WITH_CHROOT="${2}"
-				shift 2
-				;;
-
-			--debian-installer)
-				LH_DEBIAN_INSTALLER="${2}"
-				shift 2
-				;;
-
-			--debian-installer-distribution)
-				LH_DEBIAN_INSTALLER_DISTRIBUTION="${2}"
-				shift 2
-				;;
-
-			--debian-installer-preseedfile)
-				LH_DEBIAN_INSTALLER_PRESEEDFILE="${2}"
-				shift 2
-				;;
-
-			--debian-installer-gui)
-				LH_DEBIAN_INSTALLER_GUI="${2}"
-				shift 2
-				;;
-
-			-e|--encryption)
-				LH_ENCRYPTION="${2}"
-				shift 2
-				;;
-
-			--grub-splash)
-				LH_GRUB_SPLASH="${2}"
-				shift 2
-				;;
-
-			--hostname)
-				LH_HOSTNAME="${2}"
-				shift 2
-				;;
-
-			--isohybrid-options)
-				LH_ISOHYBRID_OPTIONS="${2}"
-				shift 2
-				;;
-
-			--iso-application)
-				LH_ISO_APPLICATION="${2}"
-				shift 2
-				;;
-
-			--iso-preparer)
-				LH_ISO_PREPARER="${2}"
-				shift 2
-				;;
-
-			--iso-publisher)
-				LH_ISO_PUBLISHER="${2}"
-				shift 2
-				;;
-
-			--iso-volume)
-				LH_ISO_VOLUME="${2}"
-				shift 2
-				;;
-
-			--jffs2-eraseblock)
-				LH_JFFS2_ERASEBLOCK="${2}"
-				shift 2
-				;;
-
-			--memtest)
-				LH_MEMTEST="${2}"
-				shift 2
-				;;
-
-			--net-root-filesystem)
-				LH_NET_ROOT_FILESYSTEM="${2}"
-				shift 2
-				;;
-
-			--net-root-mountoptions)
-				LH_NET_ROOT_MOUNTOPTIONS="${2}"
-				shift 2
-				;;
-
-			--net-root-path)
-				LH_NET_ROOT_PATH="${2}"
-				shift 2
-				;;
-
-			--net-root-server)
-				LH_NET_ROOT_SERVER="${2}"
-				shift 2
-				;;
-
-			--net-cow-filesystem)
-				LH_NET_COW_FILESYSTEM="${2}"
-				shift 2
-				;;
-
-			--net-cow-mountoptions)
-				LH_NET_COW_MOUNTOPTIONS="${2}"
-				shift 2
-				;;
-
-			--net-cow-path)
-				LH_NET_COW_PATH="${2}"
-				shift 2
-				;;
-
-			--net-cow-server)
-				LH_NET_COW_SERVER="${2}"
-				shift 2
-				;;
-
-			--net-tarball)
-				LH_NET_TARBALL="${2}"
-				shift 2
-				;;
-
-			--syslinux-splash)
-				LH_SYSLINUX_SPLASH="${2}"
-				shift 2
-				;;
-
-			--syslinux-timeout)
-				LH_SYSLINUX_TIMEOUT="${2}"
-				shift 2
-				;;
-
-			--syslinux-menu)
-				LH_SYSLINUX_MENU="${2}"
-				shift 2
-				;;
-
-			--username)
-				LH_USERNAME="${2}"
-				shift 2
-				;;
-
-			--win32-loader)
-				LH_WIN32_LOADER="${2}"
-				shift 2
-				;;
-
-			# config/source
-			--source)
-				LH_SOURCE="${2}"
-				shift 2
-				;;
-
-			-s|--source-images)
-				LH_SOURCE_IMAGES="${2}"
-				shift 2
-				;;
-
-			# other
-			--breakpoints)
-				_BREAKPOINTS="true"
-				shift
-				;;
-
-			-c|--conffile)
-				_CONFFILE="${2}"
-				shift 2
-				;;
-
-			--color)
-				_COLOR="true"
-				shift
-				;;
-
-			--debug)
-				_DEBUG="true"
-				shift
-				;;
-
-			--force)
-				_FORCE="true"
-				shift
-				;;
-
-			-h|--help)
-				Help
-				shift
-				;;
-
-			--ignore-system-defaults)
-				shift
-				;;
-
-			--quiet)
-				_QUIET="true"
-				shift
-				;;
-
-			-u|--usage)
-				Usage
-				shift
-				;;
-
-			--verbose)
-				_VERBOSE="true"
-				shift
-				;;
-
-			-v|--version)
-				Version
-				shift
-				;;
-
-			--)
-				shift
-				break
-				;;
-
-			*)
-				Echo_error "internal error %s" "${0}"
-				exit 1
-				;;
-		esac
-	done
-}
-
-# Reading system configuration
-if [ -f "${SYSTEM_LH_CONFFILE}" ] && ! In_list "--ignore-system-defaults" "${@}"
-then
-	Echo_message "Considering defaults defined in %s" "${SYSTEM_LH_CONFFILE}"
-	Read_conffiles "${SYSTEM_LH_CONFFILE}"
-fi
-
-# Reading existing configuration
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-
-Local_arguments "${@}"
-
-if [ -n "${_CONFFILE}" ]
-then
-	Read_conffiles "${_CONFFILE}"
-fi
-
-# Setting defaults
-Set_defaults
-
-# Checking defaults
-Check_defaults
-
-if [ ! -e config ]
-then
-	Echo_message "Creating config tree"
-else
-	Echo_message "Updating config tree"
-fi
-
-# Creating bootstrap configuration
-mkdir -p config
-mkdir -p config/includes
-mkdir -p config/templates
-
-# Creating live-helper configuration
-cat > config/common << EOF
-# config/common - common options for live-helper(7)
-
-# LH_CONFIG_VERSION: internal version of the configuration file format
-LH_CONFIG_VERSION="${CONFIG_VERSION}"
-
-# \$LH_APT: set package manager
-# (Default: ${LH_APT})
-LH_APT="${LH_APT}"
-
-# \$LH_APT_FTP_PROXY: set apt/aptitude ftp proxy
-# (Default: autodetected or empty)
-LH_APT_FTP_PROXY="${LH_APT_FTP_PROXY}"
-
-# \$LH_APT_HTTP_PROXY: set apt/aptitude http proxy
-# (Default: autodetected or empty)
-LH_APT_HTTP_PROXY="${LH_APT_HTTP_PROXY}"
-
-# \$LH_APT_PDIFFS: set apt/aptitude pdiff indices
-# (Default: ${LH_APT_PDIFFS})
-LH_APT_PDIFFS="${LH_APT_PDIFFS}"
-
-# \$LH_APT_PIPELINE: set apt/aptitude pipeline depth
-# (Default: ${LH_APT_PIPELINE})
-LH_APT_PIPELINE="${LH_APT_PIPELINE}"
-
-# \$LH_APT_RECOMMENDS: set apt/aptitude recommends
-# (Default: ${LH_APT_RECOMMENDS})
-LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}"
-
-# \$LH_APT_SECURE: set apt/aptitude security
-# (Default: ${LH_APT_SECURE})
-LH_APT_SECURE="${LH_APT_SECURE}"
-
-# \$LH_BOOTSTRAP: set bootstrap program
-# (Default: ${LH_BOOTSTRAP})
-LH_BOOTSTRAP="${LH_BOOTSTRAP}"
-
-# \$LH_CACHE: control cache
-# (Default: ${LH_CACHE})
-LH_CACHE="${LH_CACHE}"
-
-# \$LH_CACHE_INDICES: control if downloaded package indices should be cached
-# (Default: ${LH_CACHE_INDICES})
-LH_CACHE_INDICES="${LH_CACHE_INDICES}"
-
-# \$LH_CACHE_PACKAGES: control if downloaded packages files should be cached
-# (Default: ${LH_CACHE_PACKAGES})
-LH_CACHE_PACKAGES="${LH_CACHE_PACKAGES}"
-
-# \$LH_CACHE_STAGES: control if completed stages should be cached
-# (Default: ${LH_CACHE_STAGES})
-LH_CACHE_STAGES="${LH_CACHE_STAGES}"
-
-# \$LH_DEBCONF_FRONTEND: set debconf(1) frontend to use
-# (Default: ${LH_DEBCONF_FRONTEND})
-LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}"
-
-# \$LH_DEBCONF_NOWARNINGS: set debconf(1) warnings
-# (Default: ${LH_DEBCONF_NOWARNINGS})
-LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}"
-
-# \$LH_DEBCONF_PRIORITY: set debconf(1) priority to use
-# (Default: ${LH_DEBCONF_PRIORITY})
-LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}"
-
-# \$LH_INITRAMFS: set initramfs hook
-# (Default: ${LH_INITRAMFS})
-LH_INITRAMFS="${LH_INITRAMFS}"
-
-# \$LH_FDISK: set fdisk program
-# (Default: autodetected)
-LH_FDISK="${LH_FDISK}"
-
-# \$LH_LOSETUP: set losetup program
-# (Default: autodetected)
-LH_LOSETUP="${LH_LOSETUP}"
-
-# \$LH_MODE: set distribution mode
-# (Default: ${LH_MODE})
-LH_MODE="${LH_MODE}"
-
-# \$LH_ROOT_COMMAND: use sudo or equivalent
-# (Default: empty)
-#LH_ROOT_COMMAND="sudo"
-
-# \$LH_USE_FAKEROOT: use fakeroot/fakechroot
-# (Default: ${LH_USE_FAKEROOT})
-LH_USE_FAKEROOT="${LH_USE_FAKEROOT}"
-
-# \$LH_TASKSEL: set tasksel program
-# (Default: ${LH_TASKSEL})
-LH_TASKSEL="${LH_TASKSEL}"
-
-# \$LH_INCLUDES: set includes
-# (Default: ${LH_INCLUDES})
-LH_INCLUDES="${LH_INCLUDES}"
-
-# \$LH_TEMPLATES: set templates
-# (Default: ${LH_TEMPLATES})
-LH_TEMPLATES="${LH_TEMPLATES}"
-
-# Live-helper options
-
-# \$_BREAKPOINTS: enable breakpoints
-# (Default: ${_BREAKPOINTS})
-#_BREAKPOINTS="${_BREAKPOINTS}"
-
-# \$_DEBUG: enable debug
-# (Default: ${_DEBUG})
-#_DEBUG="${_DEBUG}"
-
-# \$_COLOR: enable color
-# (Default: ${_COLOR})
-#_COLOR="${_COLOR}"
-
-# \$_FORCE: enable force
-# (Default: ${_FORCE})
-#_FORCE="${_FORCE}"
-
-# \$_QUIET: enable quiet
-# (Default: ${_QUIET})
-_QUIET="${_QUIET}"
-
-# \$_VERBOSE: enable verbose
-# (Default: ${_VERBOSE})
-#_VERBOSE="${_VERBOSE}"
-
-# Internal stuff (FIXME)
-APT_OPTIONS="${APT_OPTIONS}"
-APTITUDE_OPTIONS="${APTITUDE_OPTIONS}"
-GZIP_OPTIONS="${GZIP_OPTIONS}"
-ISOHYBRID_OPTIONS="${ISOHYBRID_OPTIONS}"
-EOF
-
-# Creating lh_bootstrap_* configuration
-cat > config/bootstrap << EOF
-# config/bootstrap - options for live-helper(7), bootstrap stage
-
-# \$LH_ARCHITECTURE: select chroot architecture
-# (Default: autodetected)
-LH_ARCHITECTURE="${LH_ARCHITECTURE}"
-
-# \$LH_BOOTSTRAP_CONFIG: set distribution config directory
-# (Default: empty)
-LH_BOOTSTRAP_CONFIG="${LH_BOOTSTRAP_CONFIG}"
-
-# \$LH_BOOTSTRAP_INCLUDE: include packages on base
-# (Default: empty)
-LH_BOOTSTRAP_INCLUDE="${LH_BOOTSTRAP_INCLUDE}"
-
-# \$LH_BOOTSTRAP_EXCLUDE: exclude packages on base
-# (Default: empty)
-LH_BOOTSTRAP_EXCLUDE="${LH_BOOTSTRAP_EXCLUDE}"
-
-# \$LH_BOOTSTRAP_FLAVOUR: select flavour to use
-# (Default: empty)
-LH_BOOTSTRAP_FLAVOUR="${LH_BOOTSTRAP_FLAVOUR}"
-
-# \$LH_BOOTSTRAP_KEYRING: set distribution keyring
-# (Default: empty)
-LH_BOOTSTRAP_KEYRING="${LH_BOOTSTRAP_KEYRING}"
-
-# \$LH_DISTRIBUTION: select distribution to use
-# (Default: ${LH_DISTRIBUTION})
-LH_DISTRIBUTION="${LH_DISTRIBUTION}"
-
-# \$LH_MIRROR_BOOTSTRAP: set mirror to bootstrap from
-# (Default: ${LH_MIRROR_BOOTSTRAP})
-LH_MIRROR_BOOTSTRAP="${LH_MIRROR_BOOTSTRAP}"
-
-# \$LH_MIRROR_CHROOT: set mirror to fetch packages from
-# (Default: ${LH_MIRROR_CHROOT})
-LH_MIRROR_CHROOT="${LH_MIRROR_CHROOT}"
-
-# \$LH_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from
-# (Default: ${LH_MIRROR_CHROOT_SECURITY})
-LH_MIRROR_CHROOT_SECURITY="${LH_MIRROR_CHROOT_SECURITY}"
-
-# \$LH_MIRROR_CHROOT_VOLATILE: set volatile mirror to fetch packages from
-# (Default: ${LH_MIRROR_CHROOT_VOLATILE})
-LH_MIRROR_CHROOT_VOLATILE="${LH_MIRROR_CHROOT_VOLATILE}"
-
-# \$LH_MIRROR_BINARY: set mirror which ends up in the image
-# (Default: ${LH_MIRROR_BINARY})
-LH_MIRROR_BINARY="${LH_MIRROR_BINARY}"
-
-# \$LH_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
-# (Default: ${LH_MIRROR_BINARY_SECURITY})
-LH_MIRROR_BINARY_SECURITY="${LH_MIRROR_BINARY_SECURITY}"
-
-# \$LH_MIRROR_BINARY_VOLATILE: set volatile mirror which ends up in the image
-# (Default: ${LH_MIRROR_BINARY_VOLATILE})
-LH_MIRROR_BINARY_VOLATILE="${LH_MIRROR_BINARY_VOLATILE}"
-
-# \$LH_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror
-# (Default: ${LH_MIRROR_BOOTSTRAP})
-LH_MIRROR_DEBIAN_INSTALLER="${LH_MIRROR_DEBIAN_INSTALLER}"
-
-# \$LH_ARCHIVE_AREAS: select archive areas to use
-# (Default: ${LH_ARCHIVE_AREAS})
-LH_ARCHIVE_AREAS="${LH_ARCHIVE_AREAS}"
-EOF
-
-# Creating lh_chroot_* configuration
-mkdir -p config/chroot_apt
-mkdir -p config/chroot_local-hooks
-mkdir -p config/chroot_local-includes
-mkdir -p config/chroot_local-patches
-mkdir -p config/chroot_local-packages
-mkdir -p config/chroot_local-packageslists
-mkdir -p config/chroot_local-preseed
-mkdir -p config/chroot_sources
-
-cat > config/chroot << EOF
-# config/chroot - options for live-helper(7), chroot stage
-
-# \$LH_CHROOT_FILESYSTEM: set chroot filesystem
-# (Default: ${LH_CHROOT_FILESYSTEM})
-LH_CHROOT_FILESYSTEM="${LH_CHROOT_FILESYSTEM}"
-
-# \$LH_UNION_FILESYSTEM: set union filesystem
-# (Default: ${LH_UNION_FILESYSTEM})
-LH_UNION_FILESYSTEM="${LH_UNION_FILESYSTEM}"
-
-# \$LH_VIRTUAL_ROOT_SIZE: set virtual-hdd filesystem size
-# (Default: ${LH_VIRTUAL_ROOT_SIZE})
-LH_VIRTUAL_ROOT_SIZE="${LH_VIRTUAL_ROOT_SIZE}"
-
-# \$LH_EXPOSED_ROOT: expose root as read only
-# (Default: ${LH_EXPOSED_ROOT})
-LH_EXPOSED_ROOT="${LH_EXPOSED_ROOT}"
-
-# \$LH_HOOKS: set hook commands
-# (Default: empty)
-LH_HOOKS="${LH_HOOKS}"
-
-# \$LH_INTERACTIVE: set interactive build
-# (Default: ${LH_INTERACTIVE})
-LH_INTERACTIVE="${LH_INTERACTIVE}"
-
-# \$LH_KEYRING_PACKAGES: set keyring packages
-# (Default: empty)
-LH_KEYRING_PACKAGES="${LH_KEYRING_PACKAGES}"
-
-# \$LH_LANGUAGE: set language to use
-# (Default: empty)
-LH_LANGUAGE="${LH_LANGUAGE}"
-
-# \$LH_LINUX_FLAVOURS: set kernel flavour to use
-# (Default: autodetected)
-LH_LINUX_FLAVOURS="${LH_LINUX_FLAVOURS}"
-
-# \$LH_LINUX_PACKAGES: set kernel packages to use
-# (Default: autodetected)
-LH_LINUX_PACKAGES="${LH_LINUX_PACKAGES}"
-
-# \$LH_REPOSITORIES: enable available third-party repositories
-# (Default: empty)
-LH_REPOSITORIES="${LH_REPOSITORIES}"
-
-# \$LH_PACKAGES: set packages to install
-# (Default: empty)
-LH_PACKAGES="${LH_PACKAGES}"
-
-# \$LH_PACKAGES_LISTS: set package list to install
-# (Default: ${LH_PACKAGES_LISTS})
-LH_PACKAGES_LISTS="${LH_PACKAGES_LISTS}"
-
-# \$LH_TASKS: set tasks to install
-# (Default: empty)
-LH_TASKS="${LH_TASKS}"
-
-# \$LH_SECURITY: enable security updates
-# (Default: ${LH_SECURITY})
-LH_SECURITY="${LH_SECURITY}"
-
-# \$LH_VOLATILE: enable volatile updates
-# (Default: ${LH_VOLATILE})
-LH_VOLATILE="${LH_VOLATILE}"
-
-# \$LH_SYMLINKS: enable symlink convertion
-# (Default: ${LH_SYMLINKS})
-LH_SYMLINKS="${LH_SYMLINKS}"
-
-# \$LH_SYSVINIT: enable sysvinit
-# (Default: ${LH_SYSVINIT})
-LH_SYSVINIT="${LH_SYSVINIT}"
-EOF
-
-# Creating lh_binary_* configuration
-mkdir -p config/binary_debian-installer
-mkdir -p config/binary_debian-installer-includes
-mkdir -p config/binary_grub
-mkdir -p config/binary_local-debs
-mkdir -p config/binary_local-hooks
-mkdir -p config/binary_local-includes
-mkdir -p config/binary_local-packageslists
-mkdir -p config/binary_local-udebs
-mkdir -p config/binary_rootfs
-mkdir -p config/binary_syslinux
-
-cat > config/binary << EOF
-# config/binary - options for live-helper(7), binary stage
-
-# \$LH_BINARY_FILESYSTEM: set image filesystem
-# (Default: ${LH_BINARY_FILESYSTEM})
-LH_BINARY_FILESYSTEM="${LH_BINARY_FILESYSTEM}"
-
-# \$LH_BINARY_IMAGES: set image type
-# (Default: ${LH_BINARY_IMAGES})
-LH_BINARY_IMAGES="${LH_BINARY_IMAGES}"
-
-# \$LH_BINARY_INDICES: set apt/aptitude generic indices
-# (Default: ${LH_BINARY_INDICES})
-LH_BINARY_INDICES="${LH_BINARY_INDICES}"
-
-# \$LH_BOOTAPPEND_LIVE: set boot parameters
-# (Default: empty)
-LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE}"
-
-# \$LH_BOOTAPPEND_INSTALL: set boot parameters
-# (Default: empty)
-LH_BOOTAPPEND_INSTALL="${LH_BOOTAPPEND_INSTALL}"
-
-# \$LH_BOOTLOADER: set bootloader
-# (Default: ${LH_BOOTLOADER})
-LH_BOOTLOADER="${LH_BOOTLOADER}"
-
-# \$LH_CHECKSUMS: set checksums
-# (Default: ${LH_CHECKSUMS})
-LH_CHECKSUMS="${LH_CHECKSUMS}"
-
-# \${LH_BUILD_WITH_CHROOT: control if we build binary images chrooted
-# (Default: ${LH_BUILD_WITH_CHROOT})
-# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to false.
-LH_BUILD_WITH_CHROOT="${LH_BUILD_WITH_CHROOT}"
-
-# \$LH_DEBIAN_INSTALLER: set debian-installer
-# (Default: ${LH_DEBIAN_INSTALLER})
-LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER}"
-
-# \$LH_DEBIAN_INSTALLER_DISTRIBUTION: set debian-installer suite
-# (Default: empty)
-LH_DEBIAN_INSTALLER_DISTRIBUTION="${LH_DEBIAN_INSTALLER_DISTRIBUTION}"
-
-# \$LH_DEBIAN_INSTALLER_PRESEEDFILE: set debian-installer preseed filename/url
-# (Default: ${LH_DEBIAN_INSTALLER_PRESEEDFILE})
-LH_DEBIAN_INSTALLER_PRESEEDFILE="${LH_DEBIAN_INSTALLER_PRESEEDFILE}"
-
-# \$LH_DEBIAN_INSTALLER_GUI: toggle use of GUI debian-installer
-# (Default: ${LH_DEBIAN_INSTALLER_GUI})
-LH_DEBIAN_INSTALLER_GUI="${LH_DEBIAN_INSTALLER_GUI}"
-
-# \$LH_ENCRYPTION: set encryption
-# (Default: ${LH_ENCRYPTION})
-LH_ENCRYPTION="${LH_ENCRYPTION}"
-
-# \$LH_GRUB_SPLASH: set custom grub splash
-# (Default: empty)
-LH_GRUB_SPLASH="${LH_GRUB_SPLASH}"
-
-# \$LH_HOSTNAME: set hostname
-# (Default: ${LH_HOSTNAME})
-LH_HOSTNAME="${LH_HOSTNAME}"
-
-# \$LH_ISO_APPLICATION: set iso author
-# (Default: ${LH_ISO_APPLICATION})
-LH_ISO_APPLICATION="${LH_ISO_APPLICATION}"
-
-# \$LH_ISO_PREPARER: set iso preparer
-# (Default: ${LH_ISO_PREPARER})
-LH_ISO_PREPARER="${LH_ISO_PREPARER}"
-
-# \$LH_ISO_PUBLISHER: set iso publisher
-# (Default: ${LH_ISO_PUBLISHER})
-LH_ISO_PUBLISHER="${LH_ISO_PUBLISHER}"
-
-# \$LH_ISO_VOLUME: set iso volume (max 32 chars)
-# (Default: ${LH_ISO_VOLUME})
-LH_ISO_VOLUME="${LH_ISO_VOLUME}"
-
-# \$LH_JFFS2_ERASEBLOCK: set jffs2 eraseblock size
-# (Default: unset)
-LH_JFFS2_ERASEBLOCK=""
-
-# \$LH_MEMTEST: set memtest
-# (Default: ${LH_MEMTEST})
-LH_MEMTEST="${LH_MEMTEST}"
-
-# \$LH_WIN32_LOADER: set win32-loader
-# (Default: ${LH_WIN32_LOADER})
-LH_WIN32_LOADER="${LH_WIN32_LOADER}"
-
-# \$LH_NET_ROOT_FILESYSTEM: set netboot filesystem
-# (Default: ${LH_NET_ROOT_FILESYSTEM})
-LH_NET_ROOT_FILESYSTEM="${LH_NET_ROOT_FILESYSTEM}"
-
-# \$LH_NET_ROOT_MOUNTOPTIONS: set nfsopts
-# (Default: empty)
-LH_NET_ROOT_MOUNTOPTIONS="${LH_NET_ROOT_MOUNTOPTIONS}"
-
-# \$LH_NET_ROOT_PATH: set netboot server directory
-# (Default: ${LH_NET_ROOT_PATH})
-LH_NET_ROOT_PATH="${LH_NET_ROOT_PATH}"
-
-# \$LH_NET_ROOT_SERVER: set netboot server address
-# (Default: ${LH_NET_ROOT_SERVER})
-LH_NET_ROOT_SERVER="${LH_NET_ROOT_SERVER}"
-
-# \$LH_NET_COW_FILESYSTEM: set net client cow filesystem
-# (Default: ${LH_NET_COW_FILESYSTEM})
-LH_NET_COW_FILESYSTEM="${LH_NET_COW_FILESYSTEM}"
-
-# \$LH_NET_COW_MOUNTOPTIONS: set cow mount options
-# (Default: empty)
-LH_NET_COW_MOUNTOPTIONS="${LH_NET_COW_MOUNTOPTIONS}"
-
-# \$LH_NET_COW_PATH: set cow directory
-# (Default: ${LH_NET_COW_PATH})
-LH_NET_COW_PATH="${LH_NET_COW_PATH}"
-
-# \$LH_NET_COW_SERVER: set cow server
-# (Default: ${LH_NET_COW_SERVER})
-LH_NET_COW_SERVER="${LH_NET_COW_SERVER}"
-
-# \$LH_NET_TARBALL: set net tarball
-# (Default: ${LH_NET_TARBALL})
-LH_NET_TARBALL="${LH_NET_TARBALL}"
-
-# \$LH_SYSLINUX_SPLASH: set custom syslinux splash
-# (Default: empty)
-LH_SYSLINUX_SPLASH="${LH_SYSLINUX_SPLASH}"
-
-# \$LH_SYSLINUX_TIMEOUT: set custom syslinux timeout in seconds
-# (Default: 0)
-LH_SYSLINUX_TIMEOUT="${LH_SYSLINUX_TIMEOUT}"
-
-# \$LH_SYSLINUX_CFG: set custom syslinux configuration file
-# (Default: empty)
-LH_SYSLINUX_CFG="${LH_SYSLINUX_CFG}"
-
-# \$LH_SYSLINUX_MENU: set syslinux menu
-# (Default: ${LH_SYSLINUX_MENU})
-LH_SYSLINUX_MENU="${LH_SYSLINUX_MENU}"
-
-# \$LH_SYSLINUX_MENU_LIVE_ENTRY: set text to be used on the menu for live entries
-# (Default: ${LH_SYSLINUX_MENU_LIVE_ENTRY})
-LH_SYSLINUX_MENU_LIVE_ENTRY="${LH_SYSLINUX_MENU_LIVE_ENTRY}"
-
-# \$LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY: set text to be used on the menu for live entries (failsafe ones)
-# (Default: ${LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY})
-LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY="${LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY}"
-
-# \$LH_SYSLINUX_MENU_MEMTEST_ENTRY: set text to be used on the menu for memtest entry
-# (Default: ${LH_SYSLINUX_MENU_MEMTEST_ENTRY})
-LH_SYSLINUX_MENU_MEMTEST_ENTRY="${LH_SYSLINUX_MENU_MEMTEST_ENTRY}"
-
-# \$LH_USERNAME: set username
-# (Default: ${LH_USERNAME})
-LH_USERNAME="${LH_USERNAME}"
-EOF
-
-# Creating lh_source_* configuration
-cat > config/source << EOF
-# config/source - options for live-helper(7), source stage
-
-# \$LH_SOURCE: set source option
-# (Default: ${LH_SOURCE})
-LH_SOURCE="${LH_SOURCE}"
-
-# \$LH_SOURCE_IMAGES: set image type
-# (Default: ${LH_SOURCE_IMAGES})
-LH_SOURCE_IMAGES="${LH_SOURCE_IMAGES}"
-EOF
-
-mkdir -p auto/functions
-
-if [ "${CONFIG}" = "clone" ] # FIXME
-then
-	# Read package selection
-	echo $(dpkg --get-selections | awk '{ print $1 }') > config/chroot_local-packageslists/local-system
-	LH_PACKAGES_LISTS="${LH_PACKAGES_LISTS} local-system"
-
-	# Read debconf questions
-	if [ ! -f /usr/bin/debconf-get-selections ]
-	then
-		Echo_warning "Please install 'debconf-utils' in order to use this feature."
-	else
-		debconf-get-selections | grep -v deinstall | cut -f1 > config/chroot_local-preseed/local-system
-	fi
-fi
-
-if [ "${BACKPORTS}" = "true" ]
-then
-	# Adding sources.list entry
-
-cat > config/chroot_sources/${LH_DISTRIBUTION}-backports.chroot << EOF
-# Backports Maintainers
-deb http://backports.debian-maintainers.org/ ${LH_DISTRIBUTION}/backports main contrib non-free
-deb-src http://backports.debian-maintainers.org/ ${LH_DISTRIBUTION}/backports main contrib non-free
-EOF
-
-	cp config/chroot_sources/${LH_DISTRIBUTION}-backports.chroot config/chroot_sources/${LH_DISTRIBUTION}-backports.binary
-
-	# Adding apt preferences
-	if ! grep -qs "^Pin: release o=backports.debian-maintainerns.org" config/chroot_apt/preferences
-	then
-
-cat >> config/chroot_apt/preferences << EOF
-Package: *
-Pin: release o=backports.debian-maintainerns.org
-Pin-Priority: 999
-EOF
-
-	fi
-
-	# Addding archive signing key
-	wget -q http://backports.debian-maintainers.org/project/openpgp/archive-key.asc -O config/chroot_sources/${LH_DISTRIBUTION}-backports.chroot.gpg
-	cp config/chroot_sources/${LH_DISTRIBUTION}-backports.chroot.gpg config/chroot_sources/${LH_DISTRIBUTION}-backports.binary.gpg
-fi
-
-# Checking defaults again
-Check_defaults
-
-# Creating stage file
-Create_stagefile .stage/config
diff --git a/helpers/lh b/helpers/lh
deleted file mode 100755
index f44634b..0000000
--- a/helpers/lh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-
-# lh(1) - generic live-helper wrapper
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'utility to build Debian Live systems')"
-HELP="FIXME"
-USAGE="FIXME"
-
-case "${1}" in
-	-h|--help)
-		if [ -x "$(which man 2>/dev/null)" ]
-		then
-			man lh
-			exit 0
-		else
-			${0} --usage
-			exit 0
-		fi
-		;;
-
-	""|-u|--usage)
-		Usage
-		;;
-
-	-v|--version)
-		Version
-		;;
-
-	*)
-		COMMAND="${1}"
-		shift
-
-		if [ -x "${LH_BASE}/helpers/${COMMAND}" ]
-		then
-			LH=1 exec "${LH_BASE}/helpers/${COMMAND}" "${@}"
-		elif [ -x /usr/share/live-helper/helpers/${COMMAND} ]
-		then
-			LH=1 exec /usr/share/live-helper/helpers/"${COMMAND}" "${@}"
-		elif [ -x "$(which ${COMMAND} 2>/dev/null)" ]
-		then
-			LH=1 exec "${COMMAND}" "${@}"
-		else
-			Echo_error "no such helper"
-			exit 1
-		fi
-		;;
-esac
diff --git a/helpers/live-helper b/helpers/live-helper
deleted file mode 100755
index a105500..0000000
--- a/helpers/live-helper
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-# live-helper(7) - the Debian Live tool suite
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# On Debian systems, the complete text of the GNU General Public License
-# can be found in /usr/share/common-licenses/GPL-3 file.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-if [ -x "$(which man 2>/dev/null)" ]
-then
-	man live-helper
-	exit 0
-else
-	Echo "live-helper is a set of scripts to build Debian Live system images."
-	echo
-	Echo "The idea behind live-helper is a framework that uses a configuration directory to completely automate and customize all aspects of building a Live image."
-	echo
-	Echo "An introduction to live-helper can be found in the live-helper(7) manpage."
-	exit 0
-fi
diff --git a/helpers/source b/helpers/source
deleted file mode 100755
index 8ba066b..0000000
--- a/helpers/source
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-
-# lh_source(1) - build source images
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'build source images')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-Require_stagefile .stage/chroot_install-packages
-
-# Setup cleanup function
-Setup_cleanup
-
-# Enabling network in chroot
-lh chroot_hosts install ${*}
-lh chroot_resolv install ${*}
-lh chroot_hostname install ${*}
-lh chroot_sources install ${*}
-
-# Preparing images
-lh source_debian-live ${*}
-lh source_debian ${*}
-lh source_disk ${*}
-lh source_checksums ${*}
-
-# Building images
-lh source_iso ${*}
-lh source_net ${*}
-lh source_tar ${*}
-lh source_usb ${*}
-lh source_virtual-hdd ${*}
-
-# Deconfiguring chroot
-rm -f .stage/chroot_sources
-lh chroot_hostname remove ${*}
-lh chroot_resolv remove ${*}
-lh chroot_hosts remove ${*}
diff --git a/helpers/source_checksums b/helpers/source_checksums
deleted file mode 100755
index 6fcee76..0000000
--- a/helpers/source_checksums
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-# lh_source_checksums(1) - create source checksums
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'create source checksums')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_CHECKSUMS}" = "none" ] || [ "${LH_SOURCE}" != "true" ]
-then
-	exit 0
-fi
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/source_debian
-
-# Checking stage file
-Check_stagefile .stage/source_checksums
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-for DIRECTORY in source/debian source/debian-live
-do
-	if [ ! -d ${DIRECTORY} ]
-	then
-		continue
-	fi
-
-	for CHECKSUM in ${LH_CHECKSUMS}
-	do
-		Echo_message "Begin creating source ${CHECKSUM}sum.txt..."
-
-		# Remove old checksums
-		if [ -f ${DIRECTORY}/${CHECKSUM}sum.txt ]
-		then
-			rm -f ${DIRECTORY}/${CHECKSUM}sum.txt
-		fi
-
-		# Calculating checksums
-		cd ${DIRECTORY}
-		find . -type f \
-			\! -path './md5sum.txt' \
-			\! -path './sha1sum.txt' \
-			\! -path './sha256sum.txt' \
-		-print0 | sort -z | xargs -0 ${CHECKSUM}sum > ../${CHECKSUM}sum.txt
-
-cat > ${CHECKSUM}sum.txt << EOF
-This file contains the list of ${CHECKSUM} checksums of all files on this medium.
-
-You can verify them automatically with the 'integrity-check' boot parameter,
-or, manually with: '${CHECKSUM}sum -c ${CHECKSUM}sum.txt'.
-
-
-EOF
-
-		cat ../${CHECKSUM}sum.txt >> ${CHECKSUM}sum.txt
-		rm -f ../${CHECKSUM}sum.txt
-
-		cd "${OLDPWD}"
-	done
-
-	# File list
-	cd ${DIRECTORY}
-	find . | sed -e 's|^.||g' | grep "^/" | sort > ../../$(echo ${DIRECTORY} | sed -e 's|/|.|').list
-	cd "${OLDPWD}"
-done
-
-# Creating stage file
-Create_stagefile .stage/source_checksums
diff --git a/helpers/source_debian b/helpers/source_debian
deleted file mode 100755
index cffca68..0000000
--- a/helpers/source_debian
+++ /dev/null
@@ -1,153 +0,0 @@
-#!/bin/sh
-
-# lh_source_debian(1) - download sources
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'debian sources')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_SOURCE}" != "true" ]
-then
-	exit 0
-fi
-
-Echo_message "Begin downloading sources..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/source_debian
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old sources
-if [ -d source/debian ]
-then
-	rm -rf source/debian
-fi
-
-# Download sources
-Chroot chroot "dpkg --get-selections" | awk '{ print $1 }' > source-selection.txt
-
-cat >> source-selection.txt << EOF
-${LH_BOOTLOADER}
-live-helper
-${LH_INITRAMFS}
-dosfstools
-genisoimage
-parted
-squashfs-tools
-genext2fs
-mtd-tools
-EOF
-
-case "${LH_ARCHITECTURE}" in
-	amd64|i386)
-
-cat >> source-selection.txt << EOF
-mtools
-syslinux
-grub
-EOF
-
-		if [ "${LH_MEMTEST}" != "false" ] && [ "${LH_MEMTEST}" != "none" ]
-		then
-			echo "${LH_MEMTEST}" >> source-selection.txt
-		fi
-		;;
-
-	powerpc)
-		echo "yaboot" >> source-selection.txt
-		;;
-
-	sparc)
-
-cat >> source-selection.txt << EOF
-silo
-sparc-utils
-EOF
-
-		;;
-esac
-
-if [ -n "${LH_TASKS}" ]
-then
-	echo "${LH_TASKSEL}" >> source-selection.txt
-fi
-
-MISSING=""
-
-grep . source-selection.txt | \
-while read PACKAGE
-do
-	if ! Chroot chroot "apt-get ${APT_OPTIONS} --download-only source ${PACKAGE}"
-	then
-		MISSING="${MISSING} ${PACKAGE}"
-	fi
-done
-
-if [ -n "${MISSING}" ]
-then
-	cat > source/missing-source.txt << EOF
-This file contains the list of binary packages that are installed on this live
-system that do not have a corresponding source package.
-
-EOF
-
-	for PACKAGE in ${MISSING}
-	do
-		Chroot chroot "dpkg -l ${PACKAGE}" | tail -n1 >> source/missing-source.txt
-	done
-fi
-
-rm -f source-selection.txt
-
-# Sort sources
-for DSC in chroot/*.dsc
-do
-	SOURCE="$(sed -n 's|^Source: ||p' ${DSC} 2>/dev/null || :)"
-	# The sed may fail if multiple dsc files exist for same source, as the
-	# first one to match will have already been moved.
-	[ -n "$SOURCE" ] || continue
-
-	case "${SOURCE}" in
-		lib?*)
-			LETTER="$(echo ${SOURCE} | sed 's|\(....\).*|\1|')"
-			;;
-
-		*)
-			LETTER="$(echo ${SOURCE} | sed 's|\(.\).*|\1|')"
-			;;
-	esac
-
-	# Install directory
-	mkdir -p source/debian/"${LETTER}"/"${SOURCE}"
-
-	# Move files
-	mv chroot/"${SOURCE}"_* source/debian/"${LETTER}"/"${SOURCE}"
-done
-
-# Creating stage file
-Create_stagefile .stage/source_debian
diff --git a/helpers/source_debian-live b/helpers/source_debian-live
deleted file mode 100755
index b3626ec..0000000
--- a/helpers/source_debian-live
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-# lh_source_debian-live(1) - copy debian-live config into source
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'copy debian-live config into source')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_SOURCE}" != "true" ]
-then
-	exit 0
-fi
-
-Echo_message "Begin copying live-helper configuration..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/source_debian-live
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old sources
-if [ -d source/debian-live ]
-then
-	rm -rf source/debian-live
-fi
-
-# Copy system configuration
-mkdir -p source/debian-live
-cp -a config source/debian-live
-
-if Find_files auto/*
-then
-	cp -a auto source/debian-live
-fi
-
-# Creating stage file
-Create_stagefile .stage/source_debian-live
diff --git a/helpers/source_disk b/helpers/source_disk
deleted file mode 100755
index 6951276..0000000
--- a/helpers/source_disk
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-
-# lh_source_disk (1) - install disk information into source
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'install disk information into source')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-case "${LH_SOURCE_IMAGES}" in
-	iso*|usb*)
-		;;
-
-	*)
-		exit 0
-		;;
-esac
-
-Echo_message "Begin installing disk information..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/source_disk
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-mkdir -p source/.disk
-
-TITLE="Debian GNU/Linux"
-DISTRIBUTION="$(echo ${LH_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
-DISTRIBUTION="${DISTRIBUTION}$(echo ${LH_DISTRIBUTION} | cut -b 2-)"
-eval VERSION="$`echo RELEASE_${LH_DISTRIBUTION}`"
-
-case "${LH_MODE}" in
-	debian)
-		STRING="Official Snapshot ${ARCHITECTURE}"
-		TRACE="project/trace/ftp-master.debian.org"
-		;;
-
-	debian-release)
-		STRING="Official ${ARCHITECTURE}"
-		TRACE="project/trace/ftp-master.debian.org"
-		;;
-
-	ubuntu)
-		TITLE="Ubuntu"
-		STRING="Build ${ARCHITECTURE}"
-		TRACE=""
-		;;
-
-	*)
-		STRING="Snapshot ${ARCHITECTURE}"
-		TRACE=""
-		;;
-esac
-
-if [ -n "${TRACE}" ]
-then
-	echo "$(wget -q ${LH_MIRROR_BOOTSTRAP}/${TRACE} -O - | head -n 1)" \
-	> source/.disk/archive_trace
-fi
-
-case "${LH_DEBIAN_INSTALLER}" in
-	cdrom)
-		echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/CD Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
-		;;
-
-	true|netinst)
-		echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/NETINST Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
-		;;
-
-	live)
-		echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/INSTALL Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
-		;;
-
-	businesscard)
-		echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/BC Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
-		;;
-
-	false)
-		echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
-		;;
-esac
-
-# Creating stage file
-Create_stagefile .stage/source_disk
diff --git a/helpers/source_iso b/helpers/source_iso
deleted file mode 100755
index c833b0b..0000000
--- a/helpers/source_iso
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/bin/sh
-
-# lh_source_iso(1) - build iso source image
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'build iso source image')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_SOURCE}" != "true" ]
-then
-	exit 0
-fi
-
-case "${LH_SOURCE_IMAGES}" in
-	iso*)
-		;;
-
-	*)
-		exit 0
-		;;
-esac
-
-Echo_message "Begin building source iso image..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/source_debian
-
-# Checking stage file
-Check_stagefile .stage/source_iso
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Checking depends
-Check_package chroot/usr/bin/genisoimage genisoimage
-
-# Installing depends
-Install_package
-
-# Remove old iso image
-if [ -f source.iso ]
-then
-	rm -f source.iso
-fi
-
-if [ "${_QUIET}" = "true" ]
-then
-	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet"
-fi
-
-if [ "${_VERBOSE}" = "true" ]
-then
-	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
-fi
-
-if [ -n "${LH_ISO_APPLICATION}" ] && [ "${LH_ISO_APPLICATION}" != "none" ]
-then
-	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LH_ISO_APPLICATION}\""
-fi
-
-if [ -n "${LH_ISO_PREPARER}" ] && [ "${LH_ISO_PREPARER}" != "none" ]
-then
-	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LH_ISO_PREPARER}\""
-fi
-
-if [ -n "${LH_ISO_PUBLISHER}" ] && [ "${LH_ISO_PUBLISHER}" != "none" ]
-then
-	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LH_ISO_PUBLISHER}\""
-fi
-
-if [ -n "${LH_ISO_VOLUME}" ] && [ "${LH_ISO_VOLUME}" != "none" ]
-then
-	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LH_ISO_VOLUME}\""
-fi
-
-# Moving image
-mv source chroot
-
-cat >> chroot/source.sh << EOF
-genisoimage ${GENISOIMAGE_OPTIONS} -o source.iso -r -J -l -cache-inodes source
-EOF
-
-Chroot chroot "sh source.sh"
-
-# Move image
-mv chroot/source chroot/source.iso ./
-rm -f chroot/source.sh
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/source_iso
diff --git a/helpers/source_net b/helpers/source_net
deleted file mode 100755
index bf65fed..0000000
--- a/helpers/source_net
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-
-# lh_source_net(1) - build source net image
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'build source net image')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_SOURCE}" != "true" ]
-then
-	exit 0
-fi
-
-if ! In_list net "${LH_SOURCE_IMAGES}"
-then
-	exit 0
-fi
-
-Echo_message "Begin building source netboot image..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/source_debian
-
-# Checking stage file
-Check_stagefile .stage/source_net
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old source
-if [ -f source-net.tar.gz ]
-then
-	rm -f source-net.tar.gz
-fi
-
-# Create tarball
-tar cf source-net.tar source
-gzip ${GZIP_OPTIONS} source-net.tar
-
-# Creating stage file
-Create_stagefile .stage/source_net
diff --git a/helpers/source_tar b/helpers/source_tar
deleted file mode 100755
index 207e3b4..0000000
--- a/helpers/source_tar
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-# lh_source_tar(1) - build source tarball
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'build source tarball')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_SOURCE}" != "true" ]
-then
-	exit 0
-fi
-
-if ! In_list tar "${LH_SOURCE_IMAGES}"
-then
-	exit 0
-fi
-
-Echo_message "Begin building source tarball..."
-Echo_message "This may take a while."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/source_debian
-
-# Checking stage file
-Check_stagefile .stage/source_tar
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Remove old source
-rm -f source.debian.tar.gz
-rm -f source.debian-live.tar.gz
-
-# Create tarballs
-tar cf source.debian.tar source/debian
-gzip ${GZIP_OPTIONS} source.debian.tar
-
-tar cf source.debian-live.tar source/debian-live
-gzip ${GZIP_OPTIONS} source.debian-live.tar
-
-# Creating stage file
-Create_stagefile .stage/source_tar
diff --git a/helpers/source_usb b/helpers/source_usb
deleted file mode 100755
index dc5bb22..0000000
--- a/helpers/source_usb
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/bin/sh
-
-# lh_source_usb(1) - build source usb image
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'build source image')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_SOURCE}" != "true" ]
-then
-	exit 0
-fi
-
-if ! In_list usb-hdd "${LH_SOURCE_IMAGES}"
-then
-	exit 0
-fi
-
-Echo_message "Begin building source usb image..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/source_debian
-
-# Checking stage file
-Check_stagefile .stage/source_usb
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Checking depends
-Check_package chroot/sbin/mkdosfs dosfstools
-Check_package chroot/sbin/parted parted
-
-# Installing depends
-Install_package
-
-# Remove old source
-if [ -f source.img ]
-then
-	rm -f source.img
-fi
-
-# Everything which comes here needs to be cleaned up,
-DU_DIM="$(du -ms source | cut -f1)"
-REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LH_BINARY_FILESYSTEM})"
-dd if=/dev/zero of=source.img bs=1024k count=0 seek=${REAL_DIM}
-FREELO="$(${LH_LOSETUP} -f)"
-if [ ! -b chroot/${FREELO} ]
-then
-	MAKEDEV="true"
-
-	mv chroot/dev chroot/dev.tmp
-	find /dev | cpio -dmpu chroot
-fi
-
-case "${LH_BINARY_FILESYSTEM}" in
-	ext2|ext3)
-		PARTITION_TYPE="ext2"
-		;;
-
-	fat16|fat32)
-		PARTITION_TYPE="${LH_BINARY_FILESYSTEM}"
-		;;
-
-	*)
-		Echo_error "Unsupported binary filesystem %s" "${LH_BINARY_FILESYSTEM}"
-		exit 1
-		;;
-esac
-
-Echo_warning "!!! The following error/warning messages can be ignored !!!"
-Losetup $FREELO source.img 0
-Chroot chroot "parted -s ${FREELO} mklabel msdos" || true
-Chroot chroot "parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100%" || true
-Chroot chroot "parted -s ${FREELO} set 1 lba off" || true
-sleep 1
-${LH_LOSETUP} -d ${FREELO}
-
-Losetup $FREELO source.img 1
-
-case "${LH_BINARY_FILESYSTEM}" in
-	ext2|ext3)
-		MKFS="${LH_BINARY_FILESYSTEM}"
-		MKFS_OPTIONS="-L DEBIAN_LIVE -m 0"
-		;;
-
-	fat16)
-		MKFS="vfat"
-		MKFS_OPTIONS="-F 16 -n DEBIAN_LIVE"
-		;;
-
-	fat32)
-		MKFS="vfat"
-		MKFS_OPTIONS="-F 32 -n DEBIAN_LIVE"
-		;;
-esac
-
-Chroot chroot "mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO}"
-
-mkdir -p source.tmp
-${LH_ROOT_COMMAND} mount ${FREELO} source.tmp
-cp -r source/* source.tmp
-${LH_ROOT_COMMAND} umount source.tmp
-rmdir source.tmp
-sleep 1
-${LH_LOSETUP} -d ${FREELO}
-Echo_warning "!!! The above error/warning messages can be ignored !!!"
-
-if [ -n "${MAKEDEV}" ]
-then
-	rm -rf chroot/dev
-	mv chroot/dev.tmp chroot/dev
-fi
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/source_usb
diff --git a/helpers/source_virtual-hdd b/helpers/source_virtual-hdd
deleted file mode 100755
index b67ee3f..0000000
--- a/helpers/source_virtual-hdd
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-
-# lh_source_virtual-hdd(1) - build source virtual-hdd image
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'build source image')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-if [ "${LH_SOURCE}" != "true" ]
-then
-	exit 0
-fi
-
-if ! In_list virtual-hdd "${LH_SOURCE_IMAGES}"
-then
-	exit 0
-fi
-
-Echo_message "Begin building source virtual-hdd image..."
-
-# Requiring stage file
-Require_stagefile .stage/config .stage/source_debian
-
-# Checking stage file
-Check_stagefile .stage/source_virtual-hdd
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
-then
-	case "${LH_BINARY_FILESYSTEM}" in
-		ext2|ext3)
-			Check_package chroot/sbin/mkfs.ext2 e2fsprogs
-			;;
-	esac
-fi
-
-# Installing depends
-Install_package
-
-# Remove old source
-if [ -f source-virtual.img ]
-then
-	rm -f source-virtual.img
-fi
-
-# Everything which comes here needs to be cleaned up,
-DU_DIM="$(du -ms source | cut -f1)"
-REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LH_BINARY_FILESYSTEM})"
-dd if=/dev/zero of=source-virtual.img bs=1024k count=0 seek=${REAL_DIM}
-
-if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
-then
-	mv source-virtual.img chroot
-
-	case "${LH_BINARY_FILESYSTEM}" in
-		ext2)
-			Chroot chroot "mkfs.ext2 -F -m 0 source-virtual.img"
-			;;
-
-		ext3)
-			Chroot chroot "mkfs.ext3 -F source-virtual.img"
-			;;
-	esac
-
-	mv chroot/source-virtual.img ./
-else
-	case "${LH_BINARY_FILESYSTEM}" in
-		ext2)
-			mkfs.ext2 -F -m 0 source-virtual.img
-			;;
-
-		ext3)
-			mkfs.ext3 -F -m 0 source-virtual.img
-			;;
-	esac
-fi
-
-mkdir -p source.tmp
-${LH_ROOT_COMMAND} mount -o loop source-virtual.img source.tmp
-cp -r source/* source.tmp
-
-${LH_ROOT_COMMAND} umount source.tmp
-rmdir source.tmp
-
-# Saving cache
-Save_cache cache/packages_binary
-
-# Removing depends
-Remove_package
-
-# Creating stage file
-Create_stagefile .stage/source_virtual-hdd
diff --git a/helpers/testroot b/helpers/testroot
deleted file mode 100755
index 952c4b2..0000000
--- a/helpers/testroot
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-# lh_testroot(1) - ensure that a system is built as root
-# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
-
-set -e
-
-# Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
-
-# Setting static variables
-DESCRIPTION="$(Echo 'ensure that a system is built as root')"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-# Reading configuration files
-Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
-Set_defaults
-
-# Checking user account
-if [ "$(${LH_ROOT_COMMAND} id -u)" -ne "0" ]
-then
-	Echo_error "need root privileges"
-	exit 1
-fi
diff --git a/manpages/bin/update-version.sh b/manpages/bin/update-version.sh
index f1d9ee4..2c51d83 100755
--- a/manpages/bin/update-version.sh
+++ b/manpages/bin/update-version.sh
@@ -2,11 +2,9 @@
 
 set -e
 
-. ../functions/common.sh
-
 DATE="$(LC_ALL=C date +%Y\\\\-%m\\\\-%d)"
 PROGRAM="LIVE\\\-HELPER"
-VERSION="${CONFIG_VERSION}"
+VERSION="$(cat ../VERSION)"
 
 echo "Updating version headers..."
 
diff --git a/manpages/de/lh.de.1 b/manpages/de/lh.de.1
index 1c81ad5..d185e50 100644
--- a/manpages/de/lh.de.1
+++ b/manpages/de/lh.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh\fP \- Wrapper für live\-helper Programme
diff --git a/manpages/de/lh_binary.de.1 b/manpages/de/lh_binary.de.1
index c208205..25b2a0a 100644
--- a/manpages/de/lh_binary.de.1
+++ b/manpages/de/lh_binary.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_binary_checksums.de.1 b/manpages/de/lh_binary_checksums.de.1
index 838484f..d3a3fe9 100644
--- a/manpages/de/lh_binary_checksums.de.1
+++ b/manpages/de/lh_binary_checksums.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary_checksums\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_binary_chroot.de.1 b/manpages/de/lh_binary_chroot.de.1
index 8f6a754..6f7834c 100644
--- a/manpages/de/lh_binary_chroot.de.1
+++ b/manpages/de/lh_binary_chroot.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary_chroot\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_binary_debian-installer.de.1 b/manpages/de/lh_binary_debian-installer.de.1
index 141eb0a..71f0f8d 100644
--- a/manpages/de/lh_binary_debian-installer.de.1
+++ b/manpages/de/lh_binary_debian-installer.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary_debian\-installer\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_binary_disk.de.1 b/manpages/de/lh_binary_disk.de.1
index 5962558..d5c15e9 100644
--- a/manpages/de/lh_binary_disk.de.1
+++ b/manpages/de/lh_binary_disk.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary_disk\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_binary_encryption.de.1 b/manpages/de/lh_binary_encryption.de.1
index 8ccffe3..4d14cf6 100644
--- a/manpages/de/lh_binary_encryption.de.1
+++ b/manpages/de/lh_binary_encryption.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary_encryption\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_binary_grub.de.1 b/manpages/de/lh_binary_grub.de.1
index 5f400b0..a505ed2 100644
--- a/manpages/de/lh_binary_grub.de.1
+++ b/manpages/de/lh_binary_grub.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary_grub\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_binary_grub2.de.1 b/manpages/de/lh_binary_grub2.de.1
index e1cad66..59ab133 100644
--- a/manpages/de/lh_binary_grub2.de.1
+++ b/manpages/de/lh_binary_grub2.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary_grub2\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_binary_includes.de.1 b/manpages/de/lh_binary_includes.de.1
index 8e26a57..d7d8eec 100644
--- a/manpages/de/lh_binary_includes.de.1
+++ b/manpages/de/lh_binary_includes.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary_includes\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_binary_iso.de.1 b/manpages/de/lh_binary_iso.de.1
index cb26d2c..d59a534 100644
--- a/manpages/de/lh_binary_iso.de.1
+++ b/manpages/de/lh_binary_iso.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary_iso\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_binary_linux-image.de.1 b/manpages/de/lh_binary_linux-image.de.1
index f8ca99a..6d13830 100644
--- a/manpages/de/lh_binary_linux-image.de.1
+++ b/manpages/de/lh_binary_linux-image.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary_linux\-image\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_binary_local-hooks.de.1 b/manpages/de/lh_binary_local-hooks.de.1
index 1e96f4c..65cc50b 100644
--- a/manpages/de/lh_binary_local-hooks.de.1
+++ b/manpages/de/lh_binary_local-hooks.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary_local\-hooks\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_binary_local-includes.de.1 b/manpages/de/lh_binary_local-includes.de.1
index da44c4a..5b4514b 100644
--- a/manpages/de/lh_binary_local-includes.de.1
+++ b/manpages/de/lh_binary_local-includes.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary_local\-includes\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_binary_local-packageslists.de.1 b/manpages/de/lh_binary_local-packageslists.de.1
index 6937966..1b4e6cf 100644
--- a/manpages/de/lh_binary_local-packageslists.de.1
+++ b/manpages/de/lh_binary_local-packageslists.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary_local\-packageslists\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_binary_manifest.de.1 b/manpages/de/lh_binary_manifest.de.1
index 88431dc..48108a3 100644
--- a/manpages/de/lh_binary_manifest.de.1
+++ b/manpages/de/lh_binary_manifest.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary_manifest\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_binary_memtest.de.1 b/manpages/de/lh_binary_memtest.de.1
index 22a0b4e..87e57df 100644
--- a/manpages/de/lh_binary_memtest.de.1
+++ b/manpages/de/lh_binary_memtest.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary_memtest\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_binary_net.de.1 b/manpages/de/lh_binary_net.de.1
index fd439c2..33e5903 100644
--- a/manpages/de/lh_binary_net.de.1
+++ b/manpages/de/lh_binary_net.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary_net\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_binary_rootfs.de.1 b/manpages/de/lh_binary_rootfs.de.1
index 06abaaa..fe3e4c0 100644
--- a/manpages/de/lh_binary_rootfs.de.1
+++ b/manpages/de/lh_binary_rootfs.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary_rootfs\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_binary_silo.de.1 b/manpages/de/lh_binary_silo.de.1
index d5ed9d8..17a8139 100644
--- a/manpages/de/lh_binary_silo.de.1
+++ b/manpages/de/lh_binary_silo.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary_silo\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_binary_syslinux.de.1 b/manpages/de/lh_binary_syslinux.de.1
index 407450a..16500b3 100644
--- a/manpages/de/lh_binary_syslinux.de.1
+++ b/manpages/de/lh_binary_syslinux.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary_syslinux\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_binary_tar.de.1 b/manpages/de/lh_binary_tar.de.1
index 90e4ee7..5d7f3da 100644
--- a/manpages/de/lh_binary_tar.de.1
+++ b/manpages/de/lh_binary_tar.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary_tar\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_binary_usb.de.1 b/manpages/de/lh_binary_usb.de.1
index 104aab7..b5e03e6 100644
--- a/manpages/de/lh_binary_usb.de.1
+++ b/manpages/de/lh_binary_usb.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary_usb\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_binary_virtual-hdd.de.1 b/manpages/de/lh_binary_virtual-hdd.de.1
index 60f0aac..41a124f 100644
--- a/manpages/de/lh_binary_virtual-hdd.de.1
+++ b/manpages/de/lh_binary_virtual-hdd.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary_virtual\-hdd\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_binary_win32-loader.de.1 b/manpages/de/lh_binary_win32-loader.de.1
index ef5c254..e745809 100644
--- a/manpages/de/lh_binary_win32-loader.de.1
+++ b/manpages/de/lh_binary_win32-loader.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary_win32\-loader\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_binary_yaboot.de.1 b/manpages/de/lh_binary_yaboot.de.1
index 161e80c..7847def 100644
--- a/manpages/de/lh_binary_yaboot.de.1
+++ b/manpages/de/lh_binary_yaboot.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh binary_yaboot\fP \- Erstellt die "binary" Stufe
diff --git a/manpages/de/lh_bootstrap.de.1 b/manpages/de/lh_bootstrap.de.1
index 53ef390..02d3711 100644
--- a/manpages/de/lh_bootstrap.de.1
+++ b/manpages/de/lh_bootstrap.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh bootstrap\fP \- Erstellt die "bootstrap" Stufe
diff --git a/manpages/de/lh_bootstrap_cache.de.1 b/manpages/de/lh_bootstrap_cache.de.1
index e739c8c..47714a2 100644
--- a/manpages/de/lh_bootstrap_cache.de.1
+++ b/manpages/de/lh_bootstrap_cache.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh bootstrap_cache\fP \- Erstellt die "bootstrap" Stufe
diff --git a/manpages/de/lh_bootstrap_cdebootstrap.de.1 b/manpages/de/lh_bootstrap_cdebootstrap.de.1
index 880cd94..45cdef8 100644
--- a/manpages/de/lh_bootstrap_cdebootstrap.de.1
+++ b/manpages/de/lh_bootstrap_cdebootstrap.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh bootstrap_cdebootstrap\fP \- Erstellt die "bootstrap" Stufe
diff --git a/manpages/de/lh_bootstrap_copy.de.1 b/manpages/de/lh_bootstrap_copy.de.1
index 4d33f9b..d5d63fb 100644
--- a/manpages/de/lh_bootstrap_copy.de.1
+++ b/manpages/de/lh_bootstrap_copy.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh bootstrap_copy\fP \- Erstellt die "bootstrap" Stufe
diff --git a/manpages/de/lh_bootstrap_debootstrap.de.1 b/manpages/de/lh_bootstrap_debootstrap.de.1
index 89f568c..6d8b632 100644
--- a/manpages/de/lh_bootstrap_debootstrap.de.1
+++ b/manpages/de/lh_bootstrap_debootstrap.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh bootstrap_debootstrap\fP \- Erstellt die "bootstrap" Stufe
diff --git a/manpages/de/lh_build.de.1 b/manpages/de/lh_build.de.1
index 007dec1..672dcbd 100644
--- a/manpages/de/lh_build.de.1
+++ b/manpages/de/lh_build.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh build\fP \- Erstellt die "bootstrap", "chroot", "binary" und "source"
diff --git a/manpages/de/lh_chroot.de.1 b/manpages/de/lh_chroot.de.1
index c76946a..aae12b1 100644
--- a/manpages/de/lh_chroot.de.1
+++ b/manpages/de/lh_chroot.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_apt.de.1 b/manpages/de/lh_chroot_apt.de.1
index cb865a5..f026145 100644
--- a/manpages/de/lh_chroot_apt.de.1
+++ b/manpages/de/lh_chroot_apt.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_apt\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_cache.de.1 b/manpages/de/lh_chroot_cache.de.1
index c9f6551..a40808f 100644
--- a/manpages/de/lh_chroot_cache.de.1
+++ b/manpages/de/lh_chroot_cache.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_cache\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_debianchroot.de.1 b/manpages/de/lh_chroot_debianchroot.de.1
index 17cdef7..4e2eb83 100644
--- a/manpages/de/lh_chroot_debianchroot.de.1
+++ b/manpages/de/lh_chroot_debianchroot.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_debianchroot\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_devpts.de.1 b/manpages/de/lh_chroot_devpts.de.1
index b6d61f2..99fa4c3 100644
--- a/manpages/de/lh_chroot_devpts.de.1
+++ b/manpages/de/lh_chroot_devpts.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_devpts\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_dpkg.de.1 b/manpages/de/lh_chroot_dpkg.de.1
index 630f452..99f8576 100644
--- a/manpages/de/lh_chroot_dpkg.de.1
+++ b/manpages/de/lh_chroot_dpkg.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_dpkg\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_hacks.de.1 b/manpages/de/lh_chroot_hacks.de.1
index fb893ed..c9b1a31 100644
--- a/manpages/de/lh_chroot_hacks.de.1
+++ b/manpages/de/lh_chroot_hacks.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_hacks\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_hooks.de.1 b/manpages/de/lh_chroot_hooks.de.1
index 0b9b815..d99b7a0 100644
--- a/manpages/de/lh_chroot_hooks.de.1
+++ b/manpages/de/lh_chroot_hooks.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_hooks\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_hostname.de.1 b/manpages/de/lh_chroot_hostname.de.1
index d211f77..d3005ca 100644
--- a/manpages/de/lh_chroot_hostname.de.1
+++ b/manpages/de/lh_chroot_hostname.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_hostname\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_hosts.de.1 b/manpages/de/lh_chroot_hosts.de.1
index d48aef5..420748c 100644
--- a/manpages/de/lh_chroot_hosts.de.1
+++ b/manpages/de/lh_chroot_hosts.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_hosts\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_install-packages.de.1 b/manpages/de/lh_chroot_install-packages.de.1
index c650069..ee6dbe2 100644
--- a/manpages/de/lh_chroot_install-packages.de.1
+++ b/manpages/de/lh_chroot_install-packages.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_install\-packages\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_interactive.de.1 b/manpages/de/lh_chroot_interactive.de.1
index a338c4d..4f9d221 100644
--- a/manpages/de/lh_chroot_interactive.de.1
+++ b/manpages/de/lh_chroot_interactive.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_interactive\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_linux-image.de.1 b/manpages/de/lh_chroot_linux-image.de.1
index 7ee29b3..24b8682 100644
--- a/manpages/de/lh_chroot_linux-image.de.1
+++ b/manpages/de/lh_chroot_linux-image.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_linux\-image\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_local-hooks.de.1 b/manpages/de/lh_chroot_local-hooks.de.1
index 175d05b..bafbf56 100644
--- a/manpages/de/lh_chroot_local-hooks.de.1
+++ b/manpages/de/lh_chroot_local-hooks.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_local\-hooks\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_local-includes.de.1 b/manpages/de/lh_chroot_local-includes.de.1
index 10297cf..549f055 100644
--- a/manpages/de/lh_chroot_local-includes.de.1
+++ b/manpages/de/lh_chroot_local-includes.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_local\-includes\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_local-packages.de.1 b/manpages/de/lh_chroot_local-packages.de.1
index 70273c0..b14ef30 100644
--- a/manpages/de/lh_chroot_local-packages.de.1
+++ b/manpages/de/lh_chroot_local-packages.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_local\-packages\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_local-packageslists.de.1 b/manpages/de/lh_chroot_local-packageslists.de.1
index a63e920..ca208ca 100644
--- a/manpages/de/lh_chroot_local-packageslists.de.1
+++ b/manpages/de/lh_chroot_local-packageslists.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_local\-packageslists\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_local-patches.de.1 b/manpages/de/lh_chroot_local-patches.de.1
index a0093fe..89719a6 100644
--- a/manpages/de/lh_chroot_local-patches.de.1
+++ b/manpages/de/lh_chroot_local-patches.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_local\-patches\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_local-preseed.de.1 b/manpages/de/lh_chroot_local-preseed.de.1
index a8eb5f9..5c0621d 100644
--- a/manpages/de/lh_chroot_local-preseed.de.1
+++ b/manpages/de/lh_chroot_local-preseed.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_local\-preseed\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_localization.de.1 b/manpages/de/lh_chroot_localization.de.1
index 8c2d2db..e38fd2f 100644
--- a/manpages/de/lh_chroot_localization.de.1
+++ b/manpages/de/lh_chroot_localization.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_localization\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_packages.de.1 b/manpages/de/lh_chroot_packages.de.1
index 1848e55..5388bd2 100644
--- a/manpages/de/lh_chroot_packages.de.1
+++ b/manpages/de/lh_chroot_packages.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_packages\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_packageslists.de.1 b/manpages/de/lh_chroot_packageslists.de.1
index d34f4ee..9108446 100644
--- a/manpages/de/lh_chroot_packageslists.de.1
+++ b/manpages/de/lh_chroot_packageslists.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_packageslists\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_preseed.de.1 b/manpages/de/lh_chroot_preseed.de.1
index 216f2e3..de7f3b7 100644
--- a/manpages/de/lh_chroot_preseed.de.1
+++ b/manpages/de/lh_chroot_preseed.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_preseed\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_proc.de.1 b/manpages/de/lh_chroot_proc.de.1
index 86d7278..431b324 100644
--- a/manpages/de/lh_chroot_proc.de.1
+++ b/manpages/de/lh_chroot_proc.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_proc\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_resolv.de.1 b/manpages/de/lh_chroot_resolv.de.1
index de9edb8..4811775 100644
--- a/manpages/de/lh_chroot_resolv.de.1
+++ b/manpages/de/lh_chroot_resolv.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_resolv\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_selinuxfs.de.1 b/manpages/de/lh_chroot_selinuxfs.de.1
index 5dfd8b5..9b27c98 100644
--- a/manpages/de/lh_chroot_selinuxfs.de.1
+++ b/manpages/de/lh_chroot_selinuxfs.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_selinuxfs\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_sources.de.1 b/manpages/de/lh_chroot_sources.de.1
index 20c852a..86b0a76 100644
--- a/manpages/de/lh_chroot_sources.de.1
+++ b/manpages/de/lh_chroot_sources.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_sources\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_symlinks.de.1 b/manpages/de/lh_chroot_symlinks.de.1
index 713ec90..da644e4 100644
--- a/manpages/de/lh_chroot_symlinks.de.1
+++ b/manpages/de/lh_chroot_symlinks.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_symlinks\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_sysfs.de.1 b/manpages/de/lh_chroot_sysfs.de.1
index 56d72bd..984a537 100644
--- a/manpages/de/lh_chroot_sysfs.de.1
+++ b/manpages/de/lh_chroot_sysfs.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_sysfs\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_sysv-rc.de.1 b/manpages/de/lh_chroot_sysv-rc.de.1
index be580f6..a865cfa 100644
--- a/manpages/de/lh_chroot_sysv-rc.de.1
+++ b/manpages/de/lh_chroot_sysv-rc.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_sysv\-rc\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_sysvinit.de.1 b/manpages/de/lh_chroot_sysvinit.de.1
index 5021fd9..addde77 100644
--- a/manpages/de/lh_chroot_sysvinit.de.1
+++ b/manpages/de/lh_chroot_sysvinit.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_sysvinit\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_tasks.de.1 b/manpages/de/lh_chroot_tasks.de.1
index d7ea3cb..0b440a3 100644
--- a/manpages/de/lh_chroot_tasks.de.1
+++ b/manpages/de/lh_chroot_tasks.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_tasks\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_chroot_upstart.de.1 b/manpages/de/lh_chroot_upstart.de.1
index aca2acf..b3bb633 100644
--- a/manpages/de/lh_chroot_upstart.de.1
+++ b/manpages/de/lh_chroot_upstart.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh chroot_upstart\fP \- Erstellt die "chroot" Stufe
diff --git a/manpages/de/lh_clean.de.1 b/manpages/de/lh_clean.de.1
index 340c0b8..2e46ec3 100644
--- a/manpages/de/lh_clean.de.1
+++ b/manpages/de/lh_clean.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh clean\fP \- Räumt das Arbeitsverzeichnis auf
diff --git a/manpages/de/lh_config.de.1 b/manpages/de/lh_config.de.1
index 1090c12..e5fab74 100644
--- a/manpages/de/lh_config.de.1
+++ b/manpages/de/lh_config.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh config\fP \- Erstellen des config Verzeichnisses
diff --git a/manpages/de/lh_local.de.1 b/manpages/de/lh_local.de.1
index a177ab6..de1caba 100644
--- a/manpages/de/lh_local.de.1
+++ b/manpages/de/lh_local.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh local\fP \- Wrapper für lokale live\-helper Programme
diff --git a/manpages/de/lh_source.de.1 b/manpages/de/lh_source.de.1
index 6351351..631657b 100644
--- a/manpages/de/lh_source.de.1
+++ b/manpages/de/lh_source.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh source\fP \- Erstellt die "source" Stufe
diff --git a/manpages/de/lh_source_checksums.de.1 b/manpages/de/lh_source_checksums.de.1
index 59531ee..b2ebd6f 100644
--- a/manpages/de/lh_source_checksums.de.1
+++ b/manpages/de/lh_source_checksums.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh source_checksums\fP \- Erstellt die "source" Stufe
diff --git a/manpages/de/lh_source_debian-live.de.1 b/manpages/de/lh_source_debian-live.de.1
index 5fadf23..0a4041d 100644
--- a/manpages/de/lh_source_debian-live.de.1
+++ b/manpages/de/lh_source_debian-live.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh source_debian\-live\fP \- Erstellt die "source" Stufe
diff --git a/manpages/de/lh_source_debian.de.1 b/manpages/de/lh_source_debian.de.1
index 29505c6..aa11f6f 100644
--- a/manpages/de/lh_source_debian.de.1
+++ b/manpages/de/lh_source_debian.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh source_debian\fP \- Erstellt die "source" Stufe
diff --git a/manpages/de/lh_source_disk.de.1 b/manpages/de/lh_source_disk.de.1
index e9bbf98..28f5672 100644
--- a/manpages/de/lh_source_disk.de.1
+++ b/manpages/de/lh_source_disk.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh source_disk\fP \- Erstellt die "source" Stufe
diff --git a/manpages/de/lh_source_iso.de.1 b/manpages/de/lh_source_iso.de.1
index baf9ecc..ab70e8e 100644
--- a/manpages/de/lh_source_iso.de.1
+++ b/manpages/de/lh_source_iso.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh source_iso\fP \- Erstellt die "source" Stufe
diff --git a/manpages/de/lh_source_net.de.1 b/manpages/de/lh_source_net.de.1
index a8174d6..966bdf3 100644
--- a/manpages/de/lh_source_net.de.1
+++ b/manpages/de/lh_source_net.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh source_net\fP \- Erstellt die "source" Stufe
diff --git a/manpages/de/lh_source_tar.de.1 b/manpages/de/lh_source_tar.de.1
index d0ef7b0..f9939d4 100644
--- a/manpages/de/lh_source_tar.de.1
+++ b/manpages/de/lh_source_tar.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh source_tar\fP \- Erstellt die "source" Stufe
diff --git a/manpages/de/lh_source_usb.de.1 b/manpages/de/lh_source_usb.de.1
index be7da16..0004aef 100644
--- a/manpages/de/lh_source_usb.de.1
+++ b/manpages/de/lh_source_usb.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh source_usb\fP \- Erstellt die "source" Stufe
diff --git a/manpages/de/lh_source_virtual-hdd.de.1 b/manpages/de/lh_source_virtual-hdd.de.1
index edb2c53..fa63304 100644
--- a/manpages/de/lh_source_virtual-hdd.de.1
+++ b/manpages/de/lh_source_virtual-hdd.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh source_virtual\-hdd\fP \- Erstellt die "source" Stufe
diff --git a/manpages/de/lh_testroot.de.1 b/manpages/de/lh_testroot.de.1
index a8ef667..89531b0 100644
--- a/manpages/de/lh_testroot.de.1
+++ b/manpages/de/lh_testroot.de.1
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 1 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 1 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlh testroot\fP \- stellt sicher, dass ein System als root erstellt wird
diff --git a/manpages/de/live-helper.de.7 b/manpages/de/live-helper.de.7
index 83ab980..4eb878f 100644
--- a/manpages/de/live-helper.de.7
+++ b/manpages/de/live-helper.de.7
@@ -3,7 +3,7 @@
 .\" This file was generated with po4a. Translate the source file.
 .\"
 .\"*******************************************************************
-.TH LIVE\-HELPER 7 18.07.2010 2.0~a19 "Debian Live Projekt"
+.TH LIVE\-HELPER 7 24.07.2010 2.0~a20 "Debian Live Projekt"
 
 .SH NAME
 \fBlive\-helper\fP \- die Debian Live Tool Suite
diff --git a/manpages/en/lh.1 b/manpages/en/lh.1
index 03433db..51ff61b 100644
--- a/manpages/en/lh.1
+++ b/manpages/en/lh.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh\fR \- wrapper for live\-helper programs
diff --git a/manpages/en/lh_binary.1 b/manpages/en/lh_binary.1
index 17f73ab..370c57e 100644
--- a/manpages/en/lh_binary.1
+++ b/manpages/en/lh_binary.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary\fR \- Complete the binary stage
diff --git a/manpages/en/lh_binary_checksums.1 b/manpages/en/lh_binary_checksums.1
index 75b4f78..59ef9ec 100644
--- a/manpages/en/lh_binary_checksums.1
+++ b/manpages/en/lh_binary_checksums.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary_checksums\fR \- Complete the binary stage
diff --git a/manpages/en/lh_binary_chroot.1 b/manpages/en/lh_binary_chroot.1
index ea57695..f66e463 100644
--- a/manpages/en/lh_binary_chroot.1
+++ b/manpages/en/lh_binary_chroot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary_chroot\fR \- Complete the binary stage
diff --git a/manpages/en/lh_binary_debian-installer.1 b/manpages/en/lh_binary_debian-installer.1
index 8e1527b..c322bee 100644
--- a/manpages/en/lh_binary_debian-installer.1
+++ b/manpages/en/lh_binary_debian-installer.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary_debian\-installer\fR \- Complete the binary stage
diff --git a/manpages/en/lh_binary_disk.1 b/manpages/en/lh_binary_disk.1
index 531d21c..af23b0c 100644
--- a/manpages/en/lh_binary_disk.1
+++ b/manpages/en/lh_binary_disk.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary_disk\fR \- Complete the binary stage
diff --git a/manpages/en/lh_binary_encryption.1 b/manpages/en/lh_binary_encryption.1
index 4b73471..79a3fc9 100644
--- a/manpages/en/lh_binary_encryption.1
+++ b/manpages/en/lh_binary_encryption.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary_encryption\fR \- Complete the binary stage
diff --git a/manpages/en/lh_binary_grub.1 b/manpages/en/lh_binary_grub.1
index 0f47e33..78aacec 100644
--- a/manpages/en/lh_binary_grub.1
+++ b/manpages/en/lh_binary_grub.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary_grub\fR \- Complete the binary stage
diff --git a/manpages/en/lh_binary_grub2.1 b/manpages/en/lh_binary_grub2.1
index beabff8..0c97518 100644
--- a/manpages/en/lh_binary_grub2.1
+++ b/manpages/en/lh_binary_grub2.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary_grub2\fR \- Complete the binary stage
diff --git a/manpages/en/lh_binary_includes.1 b/manpages/en/lh_binary_includes.1
index d86526f..5055bbd 100644
--- a/manpages/en/lh_binary_includes.1
+++ b/manpages/en/lh_binary_includes.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary_includes\fR \- Complete the binary stage
diff --git a/manpages/en/lh_binary_iso.1 b/manpages/en/lh_binary_iso.1
index 419bbff..b7a70a4 100644
--- a/manpages/en/lh_binary_iso.1
+++ b/manpages/en/lh_binary_iso.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary_iso\fR \- Complete the binary stage
diff --git a/manpages/en/lh_binary_linux-image.1 b/manpages/en/lh_binary_linux-image.1
index ff82220..5b3739f 100644
--- a/manpages/en/lh_binary_linux-image.1
+++ b/manpages/en/lh_binary_linux-image.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary_linux\-image\fR \- Complete the binary stage
diff --git a/manpages/en/lh_binary_local-hooks.1 b/manpages/en/lh_binary_local-hooks.1
index 279789f..ce9e461 100644
--- a/manpages/en/lh_binary_local-hooks.1
+++ b/manpages/en/lh_binary_local-hooks.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary_local\-hooks\fR \- Complete the binary stage
diff --git a/manpages/en/lh_binary_local-includes.1 b/manpages/en/lh_binary_local-includes.1
index 3dd05c9..b1b1ec8 100644
--- a/manpages/en/lh_binary_local-includes.1
+++ b/manpages/en/lh_binary_local-includes.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary_local\-includes\fR \- Complete the binary stage
diff --git a/manpages/en/lh_binary_local-packageslists.1 b/manpages/en/lh_binary_local-packageslists.1
index 06dc6da..1365b1d 100644
--- a/manpages/en/lh_binary_local-packageslists.1
+++ b/manpages/en/lh_binary_local-packageslists.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary_local-packageslists\fR \- Complete the binary stage
diff --git a/manpages/en/lh_binary_manifest.1 b/manpages/en/lh_binary_manifest.1
index 373bcf3..512417c 100644
--- a/manpages/en/lh_binary_manifest.1
+++ b/manpages/en/lh_binary_manifest.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary_manifest\fR \- Complete the binary stage
diff --git a/manpages/en/lh_binary_memtest.1 b/manpages/en/lh_binary_memtest.1
index 7df389e..c1add1b 100644
--- a/manpages/en/lh_binary_memtest.1
+++ b/manpages/en/lh_binary_memtest.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary_memtest\fR \- Complete the binary stage
diff --git a/manpages/en/lh_binary_net.1 b/manpages/en/lh_binary_net.1
index abe5709..e005e83 100644
--- a/manpages/en/lh_binary_net.1
+++ b/manpages/en/lh_binary_net.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary_net\fR \- Complete the binary stage
diff --git a/manpages/en/lh_binary_rootfs.1 b/manpages/en/lh_binary_rootfs.1
index 79995e9..4382480 100644
--- a/manpages/en/lh_binary_rootfs.1
+++ b/manpages/en/lh_binary_rootfs.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary_rootfs\fR \- Complete the binary stage
diff --git a/manpages/en/lh_binary_silo.1 b/manpages/en/lh_binary_silo.1
index 9b6a032..d3baf0c 100644
--- a/manpages/en/lh_binary_silo.1
+++ b/manpages/en/lh_binary_silo.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary_silo\fR \- Complete the binary stage
diff --git a/manpages/en/lh_binary_syslinux.1 b/manpages/en/lh_binary_syslinux.1
index 31a5d60..00a26a1 100644
--- a/manpages/en/lh_binary_syslinux.1
+++ b/manpages/en/lh_binary_syslinux.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary_syslinux\fR \- Complete the binary stage
diff --git a/manpages/en/lh_binary_tar.1 b/manpages/en/lh_binary_tar.1
index 9b984e3..7502ffc 100644
--- a/manpages/en/lh_binary_tar.1
+++ b/manpages/en/lh_binary_tar.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary_tar\fR \- Complete the binary stage
diff --git a/manpages/en/lh_binary_usb.1 b/manpages/en/lh_binary_usb.1
index e503fd2..5240af9 100644
--- a/manpages/en/lh_binary_usb.1
+++ b/manpages/en/lh_binary_usb.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary_usb\fR \- Complete the binary stage
diff --git a/manpages/en/lh_binary_virtual-hdd.1 b/manpages/en/lh_binary_virtual-hdd.1
index b4c58f6..bdcdfde 100644
--- a/manpages/en/lh_binary_virtual-hdd.1
+++ b/manpages/en/lh_binary_virtual-hdd.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary_virtual\-hdd\fR \- Complete the binary stage
diff --git a/manpages/en/lh_binary_win32-loader.1 b/manpages/en/lh_binary_win32-loader.1
index 614efc9..b6eff53 100644
--- a/manpages/en/lh_binary_win32-loader.1
+++ b/manpages/en/lh_binary_win32-loader.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary_win32\-loader\fR \- Complete the binary stage
diff --git a/manpages/en/lh_binary_yaboot.1 b/manpages/en/lh_binary_yaboot.1
index 87dfd2c..b6454d3 100644
--- a/manpages/en/lh_binary_yaboot.1
+++ b/manpages/en/lh_binary_yaboot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh binary_yaboot\fR \- Complete the binary stage
diff --git a/manpages/en/lh_bootstrap.1 b/manpages/en/lh_bootstrap.1
index 2661298..4c124e7 100644
--- a/manpages/en/lh_bootstrap.1
+++ b/manpages/en/lh_bootstrap.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh bootstrap\fR \- Complete the bootstrap stage
diff --git a/manpages/en/lh_bootstrap_cache.1 b/manpages/en/lh_bootstrap_cache.1
index 229d2ae..79902de 100644
--- a/manpages/en/lh_bootstrap_cache.1
+++ b/manpages/en/lh_bootstrap_cache.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh bootstrap_cache\fR \- Complete the bootstrap stage
diff --git a/manpages/en/lh_bootstrap_cdebootstrap.1 b/manpages/en/lh_bootstrap_cdebootstrap.1
index 311fe71..d3d6943 100644
--- a/manpages/en/lh_bootstrap_cdebootstrap.1
+++ b/manpages/en/lh_bootstrap_cdebootstrap.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh bootstrap_cdebootstrap\fR \- Complete the bootstrap stage
diff --git a/manpages/en/lh_bootstrap_copy.1 b/manpages/en/lh_bootstrap_copy.1
index ce7e61d..13b1406 100644
--- a/manpages/en/lh_bootstrap_copy.1
+++ b/manpages/en/lh_bootstrap_copy.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh bootstrap_copy\fR \- Complete the bootstrap stage
diff --git a/manpages/en/lh_bootstrap_debootstrap.1 b/manpages/en/lh_bootstrap_debootstrap.1
index 4658b2e..fe05a97 100644
--- a/manpages/en/lh_bootstrap_debootstrap.1
+++ b/manpages/en/lh_bootstrap_debootstrap.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh bootstrap_debootstrap\fR \- Complete the bootstrap stage
diff --git a/manpages/en/lh_build.1 b/manpages/en/lh_build.1
index e3ec326..83a4b47 100644
--- a/manpages/en/lh_build.1
+++ b/manpages/en/lh_build.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh build\fR \- Complete the bootstrap, chroot, binary, and source stages
diff --git a/manpages/en/lh_chroot.1 b/manpages/en/lh_chroot.1
index 09a5a5e..278b03b 100644
--- a/manpages/en/lh_chroot.1
+++ b/manpages/en/lh_chroot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_apt.1 b/manpages/en/lh_chroot_apt.1
index 3413876..4c698d9 100644
--- a/manpages/en/lh_chroot_apt.1
+++ b/manpages/en/lh_chroot_apt.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_apt\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_cache.1 b/manpages/en/lh_chroot_cache.1
index bc9321a..aecdea3 100644
--- a/manpages/en/lh_chroot_cache.1
+++ b/manpages/en/lh_chroot_cache.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_cache\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_debianchroot.1 b/manpages/en/lh_chroot_debianchroot.1
index 8c6854a..361f724 100644
--- a/manpages/en/lh_chroot_debianchroot.1
+++ b/manpages/en/lh_chroot_debianchroot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_debianchroot\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_devpts.1 b/manpages/en/lh_chroot_devpts.1
index 6bb2048..31a7c2d 100644
--- a/manpages/en/lh_chroot_devpts.1
+++ b/manpages/en/lh_chroot_devpts.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_devpts\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_dpkg.1 b/manpages/en/lh_chroot_dpkg.1
index 43414f7..d8fef60 100644
--- a/manpages/en/lh_chroot_dpkg.1
+++ b/manpages/en/lh_chroot_dpkg.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_dpkg\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_hacks.1 b/manpages/en/lh_chroot_hacks.1
index 3303883..181a52a 100644
--- a/manpages/en/lh_chroot_hacks.1
+++ b/manpages/en/lh_chroot_hacks.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_hacks\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_hooks.1 b/manpages/en/lh_chroot_hooks.1
index 8a35c9f..0d707a6 100644
--- a/manpages/en/lh_chroot_hooks.1
+++ b/manpages/en/lh_chroot_hooks.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_hooks\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_hostname.1 b/manpages/en/lh_chroot_hostname.1
index dce2579..b01d15f 100644
--- a/manpages/en/lh_chroot_hostname.1
+++ b/manpages/en/lh_chroot_hostname.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_hostname\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_hosts.1 b/manpages/en/lh_chroot_hosts.1
index ec713bb..15d7fbc 100644
--- a/manpages/en/lh_chroot_hosts.1
+++ b/manpages/en/lh_chroot_hosts.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_hosts\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_install-packages.1 b/manpages/en/lh_chroot_install-packages.1
index 01ceb04..1186cb5 100644
--- a/manpages/en/lh_chroot_install-packages.1
+++ b/manpages/en/lh_chroot_install-packages.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_install\-packages\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_interactive.1 b/manpages/en/lh_chroot_interactive.1
index b58ae04..aef3b4b 100644
--- a/manpages/en/lh_chroot_interactive.1
+++ b/manpages/en/lh_chroot_interactive.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_interactive\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_linux-image.1 b/manpages/en/lh_chroot_linux-image.1
index 472a8f5..bf8b4a7 100644
--- a/manpages/en/lh_chroot_linux-image.1
+++ b/manpages/en/lh_chroot_linux-image.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_linux\-image\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_local-hooks.1 b/manpages/en/lh_chroot_local-hooks.1
index 6418ba3..86da5b8 100644
--- a/manpages/en/lh_chroot_local-hooks.1
+++ b/manpages/en/lh_chroot_local-hooks.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_local\-hooks\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_local-includes.1 b/manpages/en/lh_chroot_local-includes.1
index 2fb0a63..1dc59b7 100644
--- a/manpages/en/lh_chroot_local-includes.1
+++ b/manpages/en/lh_chroot_local-includes.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_local\-includes\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_local-packages.1 b/manpages/en/lh_chroot_local-packages.1
index 8925ff8..f9a7b1d 100644
--- a/manpages/en/lh_chroot_local-packages.1
+++ b/manpages/en/lh_chroot_local-packages.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_local\-packages\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_local-packageslists.1 b/manpages/en/lh_chroot_local-packageslists.1
index e8ddba0..5343552 100644
--- a/manpages/en/lh_chroot_local-packageslists.1
+++ b/manpages/en/lh_chroot_local-packageslists.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_local\-packageslists\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_local-patches.1 b/manpages/en/lh_chroot_local-patches.1
index 40797fd..3964766 100644
--- a/manpages/en/lh_chroot_local-patches.1
+++ b/manpages/en/lh_chroot_local-patches.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_local\-patches\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_local-preseed.1 b/manpages/en/lh_chroot_local-preseed.1
index bdf709d..7d4a2ec 100644
--- a/manpages/en/lh_chroot_local-preseed.1
+++ b/manpages/en/lh_chroot_local-preseed.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_local\-preseed\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_localization.1 b/manpages/en/lh_chroot_localization.1
index 5dbff84..853f2d2 100644
--- a/manpages/en/lh_chroot_localization.1
+++ b/manpages/en/lh_chroot_localization.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_localization\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_packages.1 b/manpages/en/lh_chroot_packages.1
index f13d5c3..4ced9f9 100644
--- a/manpages/en/lh_chroot_packages.1
+++ b/manpages/en/lh_chroot_packages.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_packages\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_packageslists.1 b/manpages/en/lh_chroot_packageslists.1
index 3f38195..1b3edaa 100644
--- a/manpages/en/lh_chroot_packageslists.1
+++ b/manpages/en/lh_chroot_packageslists.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_packageslists\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_preseed.1 b/manpages/en/lh_chroot_preseed.1
index 367389b..b5675b4 100644
--- a/manpages/en/lh_chroot_preseed.1
+++ b/manpages/en/lh_chroot_preseed.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_preseed\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_proc.1 b/manpages/en/lh_chroot_proc.1
index 4d490cc..a1054a9 100644
--- a/manpages/en/lh_chroot_proc.1
+++ b/manpages/en/lh_chroot_proc.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_proc\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_resolv.1 b/manpages/en/lh_chroot_resolv.1
index 7282868..591f365 100644
--- a/manpages/en/lh_chroot_resolv.1
+++ b/manpages/en/lh_chroot_resolv.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_resolv\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_selinuxfs.1 b/manpages/en/lh_chroot_selinuxfs.1
index 4d23c36..eb55d6b 100644
--- a/manpages/en/lh_chroot_selinuxfs.1
+++ b/manpages/en/lh_chroot_selinuxfs.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_selinuxfs\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_sources.1 b/manpages/en/lh_chroot_sources.1
index 0e62086..3a5a31e 100644
--- a/manpages/en/lh_chroot_sources.1
+++ b/manpages/en/lh_chroot_sources.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_sources\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_symlinks.1 b/manpages/en/lh_chroot_symlinks.1
index 872f29e..557b49f 100644
--- a/manpages/en/lh_chroot_symlinks.1
+++ b/manpages/en/lh_chroot_symlinks.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_symlinks\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_sysfs.1 b/manpages/en/lh_chroot_sysfs.1
index b71cd46..084ebf1 100644
--- a/manpages/en/lh_chroot_sysfs.1
+++ b/manpages/en/lh_chroot_sysfs.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_sysfs\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_sysv-rc.1 b/manpages/en/lh_chroot_sysv-rc.1
index 33d8fcb..00a2a56 100644
--- a/manpages/en/lh_chroot_sysv-rc.1
+++ b/manpages/en/lh_chroot_sysv-rc.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_sysv-rc\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_sysvinit.1 b/manpages/en/lh_chroot_sysvinit.1
index e67665e..a22e246 100644
--- a/manpages/en/lh_chroot_sysvinit.1
+++ b/manpages/en/lh_chroot_sysvinit.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_sysvinit\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_tasks.1 b/manpages/en/lh_chroot_tasks.1
index f464fd7..ce5d9a3 100644
--- a/manpages/en/lh_chroot_tasks.1
+++ b/manpages/en/lh_chroot_tasks.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_tasks\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_chroot_upstart.1 b/manpages/en/lh_chroot_upstart.1
index 63a53b6..3b85266 100644
--- a/manpages/en/lh_chroot_upstart.1
+++ b/manpages/en/lh_chroot_upstart.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh chroot_upstart\fR \- Complete the chroot stage
diff --git a/manpages/en/lh_clean.1 b/manpages/en/lh_clean.1
index 65d678b..20d53a2 100644
--- a/manpages/en/lh_clean.1
+++ b/manpages/en/lh_clean.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh clean\fR \- Clean build directory
diff --git a/manpages/en/lh_config.1 b/manpages/en/lh_config.1
index af30b3a..2c06915 100644
--- a/manpages/en/lh_config.1
+++ b/manpages/en/lh_config.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh config\fR \- Create config directory
diff --git a/manpages/en/lh_local.1 b/manpages/en/lh_local.1
index 51339ed..6324061 100644
--- a/manpages/en/lh_local.1
+++ b/manpages/en/lh_local.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh local\fR \- wrapper for local live\-helper programs
diff --git a/manpages/en/lh_source.1 b/manpages/en/lh_source.1
index aed4b7a..b883db4 100644
--- a/manpages/en/lh_source.1
+++ b/manpages/en/lh_source.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh source\fR \- Complete the source stage
diff --git a/manpages/en/lh_source_checksums.1 b/manpages/en/lh_source_checksums.1
index 20aa5e8..bb5b9dc 100644
--- a/manpages/en/lh_source_checksums.1
+++ b/manpages/en/lh_source_checksums.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh source_checksums\fR \- Complete the source stage
diff --git a/manpages/en/lh_source_debian-live.1 b/manpages/en/lh_source_debian-live.1
index aa3e07e..f67ca21 100644
--- a/manpages/en/lh_source_debian-live.1
+++ b/manpages/en/lh_source_debian-live.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh source_debian\-live\fR \- Complete the source stage
diff --git a/manpages/en/lh_source_debian.1 b/manpages/en/lh_source_debian.1
index 74ffaed..a55daa7 100644
--- a/manpages/en/lh_source_debian.1
+++ b/manpages/en/lh_source_debian.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh source_debian\fR \- Complete the source stage
diff --git a/manpages/en/lh_source_disk.1 b/manpages/en/lh_source_disk.1
index f863a6e..52c1e3b 100644
--- a/manpages/en/lh_source_disk.1
+++ b/manpages/en/lh_source_disk.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh source_disk\fR \- Complete the source stage
diff --git a/manpages/en/lh_source_iso.1 b/manpages/en/lh_source_iso.1
index 6406137..a14004a 100644
--- a/manpages/en/lh_source_iso.1
+++ b/manpages/en/lh_source_iso.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh source_iso\fR \- Complete the source stage
diff --git a/manpages/en/lh_source_net.1 b/manpages/en/lh_source_net.1
index 24c8d4a..1383f7a 100644
--- a/manpages/en/lh_source_net.1
+++ b/manpages/en/lh_source_net.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh source_net\fR \- Complete the source stage
diff --git a/manpages/en/lh_source_tar.1 b/manpages/en/lh_source_tar.1
index 773291a..94a69c6 100644
--- a/manpages/en/lh_source_tar.1
+++ b/manpages/en/lh_source_tar.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh source_tar\fR \- Complete the source stage
diff --git a/manpages/en/lh_source_usb.1 b/manpages/en/lh_source_usb.1
index f9070de..06ba2e9 100644
--- a/manpages/en/lh_source_usb.1
+++ b/manpages/en/lh_source_usb.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh source_usb\fR \- Complete the source stage
diff --git a/manpages/en/lh_source_virtual-hdd.1 b/manpages/en/lh_source_virtual-hdd.1
index 30a8d7e..05d05e1 100644
--- a/manpages/en/lh_source_virtual-hdd.1
+++ b/manpages/en/lh_source_virtual-hdd.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh source_virtual\-hdd\fR \- Complete the source stage
diff --git a/manpages/en/lh_testroot.1 b/manpages/en/lh_testroot.1
index e4fb2b8..fd21599 100644
--- a/manpages/en/lh_testroot.1
+++ b/manpages/en/lh_testroot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 1 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 1 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlh testroot\fR \- Ensure that a system is built as root
diff --git a/manpages/en/live-helper.7 b/manpages/en/live-helper.7
index 13a0855..6a0b915 100644
--- a/manpages/en/live-helper.7
+++ b/manpages/en/live-helper.7
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 7 2010\-07\-18 2.0~a19 "Debian Live Project"
+.TH LIVE\-HELPER 7 2010\-07\-24 2.0~a20 "Debian Live Project"
 
 .SH NAME
 \fBlive\-helper\fR \- the Debian Live tool suite
diff --git a/manpages/po/de/lh.1.po b/manpages/po/de/lh.1.po
index db9ec3c..031d3ab 100644
--- a/manpages/po/de/lh.1.po
+++ b/manpages/po/de/lh.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a19\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary.1.po b/manpages/po/de/lh_binary.1.po
index 3f82d80..b449696 100644
--- a/manpages/po/de/lh_binary.1.po
+++ b/manpages/po/de/lh_binary.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary_checksums.1.po b/manpages/po/de/lh_binary_checksums.1.po
index 0256f9c..766ff28 100644
--- a/manpages/po/de/lh_binary_checksums.1.po
+++ b/manpages/po/de/lh_binary_checksums.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary_chroot.1.po b/manpages/po/de/lh_binary_chroot.1.po
index 15644ee..15d546f 100644
--- a/manpages/po/de/lh_binary_chroot.1.po
+++ b/manpages/po/de/lh_binary_chroot.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary_debian-installer.1.po b/manpages/po/de/lh_binary_debian-installer.1.po
index 859d94d..11b94b0 100644
--- a/manpages/po/de/lh_binary_debian-installer.1.po
+++ b/manpages/po/de/lh_binary_debian-installer.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary_disk.1.po b/manpages/po/de/lh_binary_disk.1.po
index 8645287..89c5583 100644
--- a/manpages/po/de/lh_binary_disk.1.po
+++ b/manpages/po/de/lh_binary_disk.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary_encryption.1.po b/manpages/po/de/lh_binary_encryption.1.po
index 86a3fd4..119ecf5 100644
--- a/manpages/po/de/lh_binary_encryption.1.po
+++ b/manpages/po/de/lh_binary_encryption.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary_grub.1.po b/manpages/po/de/lh_binary_grub.1.po
index e3ef99f..fe26518 100644
--- a/manpages/po/de/lh_binary_grub.1.po
+++ b/manpages/po/de/lh_binary_grub.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary_grub2.1.po b/manpages/po/de/lh_binary_grub2.1.po
index e0f7a20..ff08579 100644
--- a/manpages/po/de/lh_binary_grub2.1.po
+++ b/manpages/po/de/lh_binary_grub2.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary_includes.1.po b/manpages/po/de/lh_binary_includes.1.po
index d0c5fd0..6a03206 100644
--- a/manpages/po/de/lh_binary_includes.1.po
+++ b/manpages/po/de/lh_binary_includes.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary_iso.1.po b/manpages/po/de/lh_binary_iso.1.po
index 7c9bab8..ef6d96a 100644
--- a/manpages/po/de/lh_binary_iso.1.po
+++ b/manpages/po/de/lh_binary_iso.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary_linux-image.1.po b/manpages/po/de/lh_binary_linux-image.1.po
index 73de51a..774ac5d 100644
--- a/manpages/po/de/lh_binary_linux-image.1.po
+++ b/manpages/po/de/lh_binary_linux-image.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary_local-hooks.1.po b/manpages/po/de/lh_binary_local-hooks.1.po
index d1fe3e5..c064a43 100644
--- a/manpages/po/de/lh_binary_local-hooks.1.po
+++ b/manpages/po/de/lh_binary_local-hooks.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary_local-includes.1.po b/manpages/po/de/lh_binary_local-includes.1.po
index f49b7b0..2993d59 100644
--- a/manpages/po/de/lh_binary_local-includes.1.po
+++ b/manpages/po/de/lh_binary_local-includes.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary_local-packageslists.1.po b/manpages/po/de/lh_binary_local-packageslists.1.po
index 7513d1c..4ee88e7 100644
--- a/manpages/po/de/lh_binary_local-packageslists.1.po
+++ b/manpages/po/de/lh_binary_local-packageslists.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary_manifest.1.po b/manpages/po/de/lh_binary_manifest.1.po
index 37bd35c..8872f72 100644
--- a/manpages/po/de/lh_binary_manifest.1.po
+++ b/manpages/po/de/lh_binary_manifest.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary_memtest.1.po b/manpages/po/de/lh_binary_memtest.1.po
index 5e06fa1..8e930e8 100644
--- a/manpages/po/de/lh_binary_memtest.1.po
+++ b/manpages/po/de/lh_binary_memtest.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary_net.1.po b/manpages/po/de/lh_binary_net.1.po
index 49e834d..796d852 100644
--- a/manpages/po/de/lh_binary_net.1.po
+++ b/manpages/po/de/lh_binary_net.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary_rootfs.1.po b/manpages/po/de/lh_binary_rootfs.1.po
index ddf1b43..fa9f0c2 100644
--- a/manpages/po/de/lh_binary_rootfs.1.po
+++ b/manpages/po/de/lh_binary_rootfs.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary_silo.1.po b/manpages/po/de/lh_binary_silo.1.po
index 1b8d3b9..7c83d16 100644
--- a/manpages/po/de/lh_binary_silo.1.po
+++ b/manpages/po/de/lh_binary_silo.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary_syslinux.1.po b/manpages/po/de/lh_binary_syslinux.1.po
index e684c82..534be47 100644
--- a/manpages/po/de/lh_binary_syslinux.1.po
+++ b/manpages/po/de/lh_binary_syslinux.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary_tar.1.po b/manpages/po/de/lh_binary_tar.1.po
index a8a7dc0..ce55f40 100644
--- a/manpages/po/de/lh_binary_tar.1.po
+++ b/manpages/po/de/lh_binary_tar.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary_usb.1.po b/manpages/po/de/lh_binary_usb.1.po
index 3adcdeb..e191c82 100644
--- a/manpages/po/de/lh_binary_usb.1.po
+++ b/manpages/po/de/lh_binary_usb.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary_virtual-hdd.1.po b/manpages/po/de/lh_binary_virtual-hdd.1.po
index 4488fc0..c4b6f1c 100644
--- a/manpages/po/de/lh_binary_virtual-hdd.1.po
+++ b/manpages/po/de/lh_binary_virtual-hdd.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary_win32-loader.1.po b/manpages/po/de/lh_binary_win32-loader.1.po
index 6fedef4..22ffa16 100644
--- a/manpages/po/de/lh_binary_win32-loader.1.po
+++ b/manpages/po/de/lh_binary_win32-loader.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_binary_yaboot.1.po b/manpages/po/de/lh_binary_yaboot.1.po
index a2072c2..6e71a4b 100644
--- a/manpages/po/de/lh_binary_yaboot.1.po
+++ b/manpages/po/de/lh_binary_yaboot.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_bootstrap.1.po b/manpages/po/de/lh_bootstrap.1.po
index b8cc990..765a894 100644
--- a/manpages/po/de/lh_bootstrap.1.po
+++ b/manpages/po/de/lh_bootstrap.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_bootstrap_cache.1.po b/manpages/po/de/lh_bootstrap_cache.1.po
index 17ed306..a3e331e 100644
--- a/manpages/po/de/lh_bootstrap_cache.1.po
+++ b/manpages/po/de/lh_bootstrap_cache.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_bootstrap_cdebootstrap.1.po b/manpages/po/de/lh_bootstrap_cdebootstrap.1.po
index 5a3a81a..64a362c 100644
--- a/manpages/po/de/lh_bootstrap_cdebootstrap.1.po
+++ b/manpages/po/de/lh_bootstrap_cdebootstrap.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_bootstrap_copy.1.po b/manpages/po/de/lh_bootstrap_copy.1.po
index 5c1460e..13d9091 100644
--- a/manpages/po/de/lh_bootstrap_copy.1.po
+++ b/manpages/po/de/lh_bootstrap_copy.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_bootstrap_debootstrap.1.po b/manpages/po/de/lh_bootstrap_debootstrap.1.po
index ffa0c5b..d0f2c17 100644
--- a/manpages/po/de/lh_bootstrap_debootstrap.1.po
+++ b/manpages/po/de/lh_bootstrap_debootstrap.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_build.1.po b/manpages/po/de/lh_build.1.po
index 609f67d..b255085 100644
--- a/manpages/po/de/lh_build.1.po
+++ b/manpages/po/de/lh_build.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-09 10:39+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot.1.po b/manpages/po/de/lh_chroot.1.po
index 9de8229..2377659 100644
--- a/manpages/po/de/lh_chroot.1.po
+++ b/manpages/po/de/lh_chroot.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_apt.1.po b/manpages/po/de/lh_chroot_apt.1.po
index cba7183..dd6b42d 100644
--- a/manpages/po/de/lh_chroot_apt.1.po
+++ b/manpages/po/de/lh_chroot_apt.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_cache.1.po b/manpages/po/de/lh_chroot_cache.1.po
index 875a769..dbdcd10 100644
--- a/manpages/po/de/lh_chroot_cache.1.po
+++ b/manpages/po/de/lh_chroot_cache.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_debianchroot.1.po b/manpages/po/de/lh_chroot_debianchroot.1.po
index e0d6b6f..2ec77d8 100644
--- a/manpages/po/de/lh_chroot_debianchroot.1.po
+++ b/manpages/po/de/lh_chroot_debianchroot.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_devpts.1.po b/manpages/po/de/lh_chroot_devpts.1.po
index 3b0b6e7..3969a70 100644
--- a/manpages/po/de/lh_chroot_devpts.1.po
+++ b/manpages/po/de/lh_chroot_devpts.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_dpkg.1.po b/manpages/po/de/lh_chroot_dpkg.1.po
index 4a5f72b..44b0c23 100644
--- a/manpages/po/de/lh_chroot_dpkg.1.po
+++ b/manpages/po/de/lh_chroot_dpkg.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_hacks.1.po b/manpages/po/de/lh_chroot_hacks.1.po
index 0b3517a..0f7777c 100644
--- a/manpages/po/de/lh_chroot_hacks.1.po
+++ b/manpages/po/de/lh_chroot_hacks.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_hooks.1.po b/manpages/po/de/lh_chroot_hooks.1.po
index 2825c7f..0b2037d 100644
--- a/manpages/po/de/lh_chroot_hooks.1.po
+++ b/manpages/po/de/lh_chroot_hooks.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_hostname.1.po b/manpages/po/de/lh_chroot_hostname.1.po
index 8660884..dc96381 100644
--- a/manpages/po/de/lh_chroot_hostname.1.po
+++ b/manpages/po/de/lh_chroot_hostname.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_hosts.1.po b/manpages/po/de/lh_chroot_hosts.1.po
index 731ffb1..ae89395 100644
--- a/manpages/po/de/lh_chroot_hosts.1.po
+++ b/manpages/po/de/lh_chroot_hosts.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_install-packages.1.po b/manpages/po/de/lh_chroot_install-packages.1.po
index 3dd3902..a82578d 100644
--- a/manpages/po/de/lh_chroot_install-packages.1.po
+++ b/manpages/po/de/lh_chroot_install-packages.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_interactive.1.po b/manpages/po/de/lh_chroot_interactive.1.po
index c868e71..fc1de9d 100644
--- a/manpages/po/de/lh_chroot_interactive.1.po
+++ b/manpages/po/de/lh_chroot_interactive.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_linux-image.1.po b/manpages/po/de/lh_chroot_linux-image.1.po
index 192e388..d3d8ffd 100644
--- a/manpages/po/de/lh_chroot_linux-image.1.po
+++ b/manpages/po/de/lh_chroot_linux-image.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_local-hooks.1.po b/manpages/po/de/lh_chroot_local-hooks.1.po
index 907863e..e630f83 100644
--- a/manpages/po/de/lh_chroot_local-hooks.1.po
+++ b/manpages/po/de/lh_chroot_local-hooks.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_local-includes.1.po b/manpages/po/de/lh_chroot_local-includes.1.po
index 8bb33b4..03a30b8 100644
--- a/manpages/po/de/lh_chroot_local-includes.1.po
+++ b/manpages/po/de/lh_chroot_local-includes.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_local-packages.1.po b/manpages/po/de/lh_chroot_local-packages.1.po
index 9e0d4aa..932881e 100644
--- a/manpages/po/de/lh_chroot_local-packages.1.po
+++ b/manpages/po/de/lh_chroot_local-packages.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_local-packageslists.1.po b/manpages/po/de/lh_chroot_local-packageslists.1.po
index cb83988..37319ad 100644
--- a/manpages/po/de/lh_chroot_local-packageslists.1.po
+++ b/manpages/po/de/lh_chroot_local-packageslists.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_local-patches.1.po b/manpages/po/de/lh_chroot_local-patches.1.po
index a5b2149..c183f43 100644
--- a/manpages/po/de/lh_chroot_local-patches.1.po
+++ b/manpages/po/de/lh_chroot_local-patches.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_local-preseed.1.po b/manpages/po/de/lh_chroot_local-preseed.1.po
index 6e53eb6..b93c8e3 100644
--- a/manpages/po/de/lh_chroot_local-preseed.1.po
+++ b/manpages/po/de/lh_chroot_local-preseed.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_localization.1.po b/manpages/po/de/lh_chroot_localization.1.po
index 39da9bc..a001ffd 100644
--- a/manpages/po/de/lh_chroot_localization.1.po
+++ b/manpages/po/de/lh_chroot_localization.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_packages.1.po b/manpages/po/de/lh_chroot_packages.1.po
index bcdcdb9..9782688 100644
--- a/manpages/po/de/lh_chroot_packages.1.po
+++ b/manpages/po/de/lh_chroot_packages.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_packageslists.1.po b/manpages/po/de/lh_chroot_packageslists.1.po
index 24f3871..7e955e1 100644
--- a/manpages/po/de/lh_chroot_packageslists.1.po
+++ b/manpages/po/de/lh_chroot_packageslists.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_preseed.1.po b/manpages/po/de/lh_chroot_preseed.1.po
index 25344e8..785afad 100644
--- a/manpages/po/de/lh_chroot_preseed.1.po
+++ b/manpages/po/de/lh_chroot_preseed.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_proc.1.po b/manpages/po/de/lh_chroot_proc.1.po
index 3d2f9bc..4d8873a 100644
--- a/manpages/po/de/lh_chroot_proc.1.po
+++ b/manpages/po/de/lh_chroot_proc.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_resolv.1.po b/manpages/po/de/lh_chroot_resolv.1.po
index a3ccd22..e3987d9 100644
--- a/manpages/po/de/lh_chroot_resolv.1.po
+++ b/manpages/po/de/lh_chroot_resolv.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_selinuxfs.1.po b/manpages/po/de/lh_chroot_selinuxfs.1.po
index 95231c9..8cfafe4 100644
--- a/manpages/po/de/lh_chroot_selinuxfs.1.po
+++ b/manpages/po/de/lh_chroot_selinuxfs.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_sources.1.po b/manpages/po/de/lh_chroot_sources.1.po
index 409578f..884b723 100644
--- a/manpages/po/de/lh_chroot_sources.1.po
+++ b/manpages/po/de/lh_chroot_sources.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-09 11:47+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_symlinks.1.po b/manpages/po/de/lh_chroot_symlinks.1.po
index 4ba2dc7..7cb43b5 100644
--- a/manpages/po/de/lh_chroot_symlinks.1.po
+++ b/manpages/po/de/lh_chroot_symlinks.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_sysfs.1.po b/manpages/po/de/lh_chroot_sysfs.1.po
index 692a0f4..c501215 100644
--- a/manpages/po/de/lh_chroot_sysfs.1.po
+++ b/manpages/po/de/lh_chroot_sysfs.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_sysv-rc.1.po b/manpages/po/de/lh_chroot_sysv-rc.1.po
index 74f5455..fd8bf8c 100644
--- a/manpages/po/de/lh_chroot_sysv-rc.1.po
+++ b/manpages/po/de/lh_chroot_sysv-rc.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_sysvinit.1.po b/manpages/po/de/lh_chroot_sysvinit.1.po
index 0da435e..15c3518 100644
--- a/manpages/po/de/lh_chroot_sysvinit.1.po
+++ b/manpages/po/de/lh_chroot_sysvinit.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_tasks.1.po b/manpages/po/de/lh_chroot_tasks.1.po
index fa39e0e..05eeb64 100644
--- a/manpages/po/de/lh_chroot_tasks.1.po
+++ b/manpages/po/de/lh_chroot_tasks.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_chroot_upstart.1.po b/manpages/po/de/lh_chroot_upstart.1.po
index 1c69bad..240b33c 100644
--- a/manpages/po/de/lh_chroot_upstart.1.po
+++ b/manpages/po/de/lh_chroot_upstart.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_clean.1.po b/manpages/po/de/lh_clean.1.po
index da60672..e9f28ed 100644
--- a/manpages/po/de/lh_clean.1.po
+++ b/manpages/po/de/lh_clean.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_config.1.po b/manpages/po/de/lh_config.1.po
index d8ffb73..68000d5 100644
--- a/manpages/po/de/lh_config.1.po
+++ b/manpages/po/de/lh_config.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_local.1.po b/manpages/po/de/lh_local.1.po
index 53c1196..1656dbb 100644
--- a/manpages/po/de/lh_local.1.po
+++ b/manpages/po/de/lh_local.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-09 12:13+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_source.1.po b/manpages/po/de/lh_source.1.po
index c8f5e85..7e99fc7 100644
--- a/manpages/po/de/lh_source.1.po
+++ b/manpages/po/de/lh_source.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_source_checksums.1.po b/manpages/po/de/lh_source_checksums.1.po
index bd5dee6..9a9ccd5 100644
--- a/manpages/po/de/lh_source_checksums.1.po
+++ b/manpages/po/de/lh_source_checksums.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-09 11:47+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_source_debian-live.1.po b/manpages/po/de/lh_source_debian-live.1.po
index 7432851..25be023 100644
--- a/manpages/po/de/lh_source_debian-live.1.po
+++ b/manpages/po/de/lh_source_debian-live.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-09 11:47+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_source_debian.1.po b/manpages/po/de/lh_source_debian.1.po
index f9196af..1fc58bc 100644
--- a/manpages/po/de/lh_source_debian.1.po
+++ b/manpages/po/de/lh_source_debian.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-09 11:47+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_source_disk.1.po b/manpages/po/de/lh_source_disk.1.po
index 1895800..29624b3 100644
--- a/manpages/po/de/lh_source_disk.1.po
+++ b/manpages/po/de/lh_source_disk.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-09 11:47+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_source_iso.1.po b/manpages/po/de/lh_source_iso.1.po
index 01fd3d1..07cc591 100644
--- a/manpages/po/de/lh_source_iso.1.po
+++ b/manpages/po/de/lh_source_iso.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-09 11:47+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_source_net.1.po b/manpages/po/de/lh_source_net.1.po
index af0c508..f000a06 100644
--- a/manpages/po/de/lh_source_net.1.po
+++ b/manpages/po/de/lh_source_net.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-09 11:47+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_source_tar.1.po b/manpages/po/de/lh_source_tar.1.po
index e636b67..008af9d 100644
--- a/manpages/po/de/lh_source_tar.1.po
+++ b/manpages/po/de/lh_source_tar.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-09 11:47+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_source_usb.1.po b/manpages/po/de/lh_source_usb.1.po
index 40395aa..f00faa1 100644
--- a/manpages/po/de/lh_source_usb.1.po
+++ b/manpages/po/de/lh_source_usb.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-09 11:47+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_source_virtual-hdd.1.po b/manpages/po/de/lh_source_virtual-hdd.1.po
index 2f35326..f0e338d 100644
--- a/manpages/po/de/lh_source_virtual-hdd.1.po
+++ b/manpages/po/de/lh_source_virtual-hdd.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-09 11:47+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/lh_testroot.1.po b/manpages/po/de/lh_testroot.1.po
index e03fd4e..eac86a4 100644
--- a/manpages/po/de/lh_testroot.1.po
+++ b/manpages/po/de/lh_testroot.1.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/po/de/live-helper.7.po b/manpages/po/de/live-helper.7.po
index bfd4f4f..53dff7f 100644
--- a/manpages/po/de/live-helper.7.po
+++ b/manpages/po/de/live-helper.7.po
@@ -4,8 +4,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: live-helper 2.0~a18\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"Project-Id-Version: live-helper 2.0~a20\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: 2010-05-08 23:50+0300\n"
 "Last-Translator: Daniel Baumann <daniel at debian.org>\n"
 "Language-Team: none\n"
@@ -82,8 +82,8 @@ msgstr "LIVE-HELPER"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
-msgstr "18.07.2010"
+msgid "2010-07-24"
+msgstr "24.07.2010"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
@@ -117,8 +117,8 @@ msgstr "18.07.2010"
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
-msgstr "2.0~a19"
+msgid "2.0~a20"
+msgstr "2.0~a20"
 
 #. type: TH
 #: en/lh.1:1 en/lh_binary.1:1 en/lh_binary_checksums.1:1
diff --git a/manpages/pot/lh.1.pot b/manpages/pot/lh.1.pot
index 60ef78f..a395f44 100644
--- a/manpages/pot/lh.1.pot
+++ b/manpages/pot/lh.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary.1.pot b/manpages/pot/lh_binary.1.pot
index 4523b0c..afa4ced 100644
--- a/manpages/pot/lh_binary.1.pot
+++ b/manpages/pot/lh_binary.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary_checksums.1.pot b/manpages/pot/lh_binary_checksums.1.pot
index 8f4be16..09b45d5 100644
--- a/manpages/pot/lh_binary_checksums.1.pot
+++ b/manpages/pot/lh_binary_checksums.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary_chroot.1.pot b/manpages/pot/lh_binary_chroot.1.pot
index e516cab..a645453 100644
--- a/manpages/pot/lh_binary_chroot.1.pot
+++ b/manpages/pot/lh_binary_chroot.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary_debian-installer.1.pot b/manpages/pot/lh_binary_debian-installer.1.pot
index 2f0cefb..eaacdd2 100644
--- a/manpages/pot/lh_binary_debian-installer.1.pot
+++ b/manpages/pot/lh_binary_debian-installer.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary_disk.1.pot b/manpages/pot/lh_binary_disk.1.pot
index d4303a0..a6e85c2 100644
--- a/manpages/pot/lh_binary_disk.1.pot
+++ b/manpages/pot/lh_binary_disk.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary_encryption.1.pot b/manpages/pot/lh_binary_encryption.1.pot
index a5f1773..e5e9dd5 100644
--- a/manpages/pot/lh_binary_encryption.1.pot
+++ b/manpages/pot/lh_binary_encryption.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary_grub.1.pot b/manpages/pot/lh_binary_grub.1.pot
index 587c8b3..11101f8 100644
--- a/manpages/pot/lh_binary_grub.1.pot
+++ b/manpages/pot/lh_binary_grub.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary_grub2.1.pot b/manpages/pot/lh_binary_grub2.1.pot
index 4318380..878b39c 100644
--- a/manpages/pot/lh_binary_grub2.1.pot
+++ b/manpages/pot/lh_binary_grub2.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary_includes.1.pot b/manpages/pot/lh_binary_includes.1.pot
index 09ba816..2fc952e 100644
--- a/manpages/pot/lh_binary_includes.1.pot
+++ b/manpages/pot/lh_binary_includes.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary_iso.1.pot b/manpages/pot/lh_binary_iso.1.pot
index 987c574..b3bfb75 100644
--- a/manpages/pot/lh_binary_iso.1.pot
+++ b/manpages/pot/lh_binary_iso.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary_linux-image.1.pot b/manpages/pot/lh_binary_linux-image.1.pot
index a9a56fc..a4942b1 100644
--- a/manpages/pot/lh_binary_linux-image.1.pot
+++ b/manpages/pot/lh_binary_linux-image.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary_local-hooks.1.pot b/manpages/pot/lh_binary_local-hooks.1.pot
index 922d6f5..ae3b442 100644
--- a/manpages/pot/lh_binary_local-hooks.1.pot
+++ b/manpages/pot/lh_binary_local-hooks.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary_local-includes.1.pot b/manpages/pot/lh_binary_local-includes.1.pot
index 7e38380..6a16685 100644
--- a/manpages/pot/lh_binary_local-includes.1.pot
+++ b/manpages/pot/lh_binary_local-includes.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary_local-packageslists.1.pot b/manpages/pot/lh_binary_local-packageslists.1.pot
index 571a416..89b9361 100644
--- a/manpages/pot/lh_binary_local-packageslists.1.pot
+++ b/manpages/pot/lh_binary_local-packageslists.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary_manifest.1.pot b/manpages/pot/lh_binary_manifest.1.pot
index a7a1a01..0d3d6f1 100644
--- a/manpages/pot/lh_binary_manifest.1.pot
+++ b/manpages/pot/lh_binary_manifest.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary_memtest.1.pot b/manpages/pot/lh_binary_memtest.1.pot
index 893bfba..662f706 100644
--- a/manpages/pot/lh_binary_memtest.1.pot
+++ b/manpages/pot/lh_binary_memtest.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary_net.1.pot b/manpages/pot/lh_binary_net.1.pot
index 6299f7d..fd06139 100644
--- a/manpages/pot/lh_binary_net.1.pot
+++ b/manpages/pot/lh_binary_net.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary_rootfs.1.pot b/manpages/pot/lh_binary_rootfs.1.pot
index 7c83b64..7a8f31d 100644
--- a/manpages/pot/lh_binary_rootfs.1.pot
+++ b/manpages/pot/lh_binary_rootfs.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary_silo.1.pot b/manpages/pot/lh_binary_silo.1.pot
index 2caea79..f7e9da9 100644
--- a/manpages/pot/lh_binary_silo.1.pot
+++ b/manpages/pot/lh_binary_silo.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary_syslinux.1.pot b/manpages/pot/lh_binary_syslinux.1.pot
index be08fbb..dfd996b 100644
--- a/manpages/pot/lh_binary_syslinux.1.pot
+++ b/manpages/pot/lh_binary_syslinux.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary_tar.1.pot b/manpages/pot/lh_binary_tar.1.pot
index 8868454..f4abeb0 100644
--- a/manpages/pot/lh_binary_tar.1.pot
+++ b/manpages/pot/lh_binary_tar.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary_usb.1.pot b/manpages/pot/lh_binary_usb.1.pot
index f64346b..d7eb387 100644
--- a/manpages/pot/lh_binary_usb.1.pot
+++ b/manpages/pot/lh_binary_usb.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary_virtual-hdd.1.pot b/manpages/pot/lh_binary_virtual-hdd.1.pot
index 19e91a9..e91caa9 100644
--- a/manpages/pot/lh_binary_virtual-hdd.1.pot
+++ b/manpages/pot/lh_binary_virtual-hdd.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary_win32-loader.1.pot b/manpages/pot/lh_binary_win32-loader.1.pot
index 6a9e2f9..0b42076 100644
--- a/manpages/pot/lh_binary_win32-loader.1.pot
+++ b/manpages/pot/lh_binary_win32-loader.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_binary_yaboot.1.pot b/manpages/pot/lh_binary_yaboot.1.pot
index 36ec5bf..2f47feb 100644
--- a/manpages/pot/lh_binary_yaboot.1.pot
+++ b/manpages/pot/lh_binary_yaboot.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_bootstrap.1.pot b/manpages/pot/lh_bootstrap.1.pot
index 8c70956..f20c9af 100644
--- a/manpages/pot/lh_bootstrap.1.pot
+++ b/manpages/pot/lh_bootstrap.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_bootstrap_cache.1.pot b/manpages/pot/lh_bootstrap_cache.1.pot
index d0436b4..e90ccca 100644
--- a/manpages/pot/lh_bootstrap_cache.1.pot
+++ b/manpages/pot/lh_bootstrap_cache.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_bootstrap_cdebootstrap.1.pot b/manpages/pot/lh_bootstrap_cdebootstrap.1.pot
index 303021c..f3273cd 100644
--- a/manpages/pot/lh_bootstrap_cdebootstrap.1.pot
+++ b/manpages/pot/lh_bootstrap_cdebootstrap.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_bootstrap_copy.1.pot b/manpages/pot/lh_bootstrap_copy.1.pot
index 7648079..51006e6 100644
--- a/manpages/pot/lh_bootstrap_copy.1.pot
+++ b/manpages/pot/lh_bootstrap_copy.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_bootstrap_debootstrap.1.pot b/manpages/pot/lh_bootstrap_debootstrap.1.pot
index 68dc268..98e015c 100644
--- a/manpages/pot/lh_bootstrap_debootstrap.1.pot
+++ b/manpages/pot/lh_bootstrap_debootstrap.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_build.1.pot b/manpages/pot/lh_build.1.pot
index 29a5e55..1b20e50 100644
--- a/manpages/pot/lh_build.1.pot
+++ b/manpages/pot/lh_build.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot.1.pot b/manpages/pot/lh_chroot.1.pot
index ed8efbf..0522320 100644
--- a/manpages/pot/lh_chroot.1.pot
+++ b/manpages/pot/lh_chroot.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_apt.1.pot b/manpages/pot/lh_chroot_apt.1.pot
index 10acae6..58ef078 100644
--- a/manpages/pot/lh_chroot_apt.1.pot
+++ b/manpages/pot/lh_chroot_apt.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_cache.1.pot b/manpages/pot/lh_chroot_cache.1.pot
index f631d65..9c87c02 100644
--- a/manpages/pot/lh_chroot_cache.1.pot
+++ b/manpages/pot/lh_chroot_cache.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_debianchroot.1.pot b/manpages/pot/lh_chroot_debianchroot.1.pot
index 90a809d..a43fe12 100644
--- a/manpages/pot/lh_chroot_debianchroot.1.pot
+++ b/manpages/pot/lh_chroot_debianchroot.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_devpts.1.pot b/manpages/pot/lh_chroot_devpts.1.pot
index 884b5d7..036fabd 100644
--- a/manpages/pot/lh_chroot_devpts.1.pot
+++ b/manpages/pot/lh_chroot_devpts.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_dpkg.1.pot b/manpages/pot/lh_chroot_dpkg.1.pot
index 691b978..609a5cd 100644
--- a/manpages/pot/lh_chroot_dpkg.1.pot
+++ b/manpages/pot/lh_chroot_dpkg.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_hacks.1.pot b/manpages/pot/lh_chroot_hacks.1.pot
index 7e69d9d..e5b2fc4 100644
--- a/manpages/pot/lh_chroot_hacks.1.pot
+++ b/manpages/pot/lh_chroot_hacks.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_hooks.1.pot b/manpages/pot/lh_chroot_hooks.1.pot
index ca639ef..de53a8e 100644
--- a/manpages/pot/lh_chroot_hooks.1.pot
+++ b/manpages/pot/lh_chroot_hooks.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_hostname.1.pot b/manpages/pot/lh_chroot_hostname.1.pot
index d3c5c51..9c1f37f 100644
--- a/manpages/pot/lh_chroot_hostname.1.pot
+++ b/manpages/pot/lh_chroot_hostname.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_hosts.1.pot b/manpages/pot/lh_chroot_hosts.1.pot
index 480e46e..556ef9b 100644
--- a/manpages/pot/lh_chroot_hosts.1.pot
+++ b/manpages/pot/lh_chroot_hosts.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_install-packages.1.pot b/manpages/pot/lh_chroot_install-packages.1.pot
index e7df33b..ff5606a 100644
--- a/manpages/pot/lh_chroot_install-packages.1.pot
+++ b/manpages/pot/lh_chroot_install-packages.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_interactive.1.pot b/manpages/pot/lh_chroot_interactive.1.pot
index df0ae92..2725824 100644
--- a/manpages/pot/lh_chroot_interactive.1.pot
+++ b/manpages/pot/lh_chroot_interactive.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_linux-image.1.pot b/manpages/pot/lh_chroot_linux-image.1.pot
index b9bb9c6..2a7158f 100644
--- a/manpages/pot/lh_chroot_linux-image.1.pot
+++ b/manpages/pot/lh_chroot_linux-image.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_local-hooks.1.pot b/manpages/pot/lh_chroot_local-hooks.1.pot
index 7714135..f6f6e74 100644
--- a/manpages/pot/lh_chroot_local-hooks.1.pot
+++ b/manpages/pot/lh_chroot_local-hooks.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_local-includes.1.pot b/manpages/pot/lh_chroot_local-includes.1.pot
index 70a2929..200a49b 100644
--- a/manpages/pot/lh_chroot_local-includes.1.pot
+++ b/manpages/pot/lh_chroot_local-includes.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_local-packages.1.pot b/manpages/pot/lh_chroot_local-packages.1.pot
index 8c6f52a..b6e2333 100644
--- a/manpages/pot/lh_chroot_local-packages.1.pot
+++ b/manpages/pot/lh_chroot_local-packages.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_local-packageslists.1.pot b/manpages/pot/lh_chroot_local-packageslists.1.pot
index 41163ea..607ac98 100644
--- a/manpages/pot/lh_chroot_local-packageslists.1.pot
+++ b/manpages/pot/lh_chroot_local-packageslists.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_local-patches.1.pot b/manpages/pot/lh_chroot_local-patches.1.pot
index e3ea765..a11404f 100644
--- a/manpages/pot/lh_chroot_local-patches.1.pot
+++ b/manpages/pot/lh_chroot_local-patches.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_local-preseed.1.pot b/manpages/pot/lh_chroot_local-preseed.1.pot
index ad26226..2e45c4c 100644
--- a/manpages/pot/lh_chroot_local-preseed.1.pot
+++ b/manpages/pot/lh_chroot_local-preseed.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_localization.1.pot b/manpages/pot/lh_chroot_localization.1.pot
index 84f73eb..dff8dde 100644
--- a/manpages/pot/lh_chroot_localization.1.pot
+++ b/manpages/pot/lh_chroot_localization.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_packages.1.pot b/manpages/pot/lh_chroot_packages.1.pot
index 5de5779..f52da6a 100644
--- a/manpages/pot/lh_chroot_packages.1.pot
+++ b/manpages/pot/lh_chroot_packages.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_packageslists.1.pot b/manpages/pot/lh_chroot_packageslists.1.pot
index 828c61e..4ef869d 100644
--- a/manpages/pot/lh_chroot_packageslists.1.pot
+++ b/manpages/pot/lh_chroot_packageslists.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_preseed.1.pot b/manpages/pot/lh_chroot_preseed.1.pot
index 0838be9..526bea4 100644
--- a/manpages/pot/lh_chroot_preseed.1.pot
+++ b/manpages/pot/lh_chroot_preseed.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_proc.1.pot b/manpages/pot/lh_chroot_proc.1.pot
index 810c866..5ef3b1c 100644
--- a/manpages/pot/lh_chroot_proc.1.pot
+++ b/manpages/pot/lh_chroot_proc.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_resolv.1.pot b/manpages/pot/lh_chroot_resolv.1.pot
index 9283a1c..352ae79 100644
--- a/manpages/pot/lh_chroot_resolv.1.pot
+++ b/manpages/pot/lh_chroot_resolv.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_selinuxfs.1.pot b/manpages/pot/lh_chroot_selinuxfs.1.pot
index f53a6c4..28429ce 100644
--- a/manpages/pot/lh_chroot_selinuxfs.1.pot
+++ b/manpages/pot/lh_chroot_selinuxfs.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_sources.1.pot b/manpages/pot/lh_chroot_sources.1.pot
index a69fee9..59183f7 100644
--- a/manpages/pot/lh_chroot_sources.1.pot
+++ b/manpages/pot/lh_chroot_sources.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_symlinks.1.pot b/manpages/pot/lh_chroot_symlinks.1.pot
index 2dbd278..5c20594 100644
--- a/manpages/pot/lh_chroot_symlinks.1.pot
+++ b/manpages/pot/lh_chroot_symlinks.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_sysfs.1.pot b/manpages/pot/lh_chroot_sysfs.1.pot
index a4cba18..27baab4 100644
--- a/manpages/pot/lh_chroot_sysfs.1.pot
+++ b/manpages/pot/lh_chroot_sysfs.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_sysv-rc.1.pot b/manpages/pot/lh_chroot_sysv-rc.1.pot
index f36c900..00da790 100644
--- a/manpages/pot/lh_chroot_sysv-rc.1.pot
+++ b/manpages/pot/lh_chroot_sysv-rc.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_sysvinit.1.pot b/manpages/pot/lh_chroot_sysvinit.1.pot
index 3321bc5..ef808e7 100644
--- a/manpages/pot/lh_chroot_sysvinit.1.pot
+++ b/manpages/pot/lh_chroot_sysvinit.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_tasks.1.pot b/manpages/pot/lh_chroot_tasks.1.pot
index bc02455..ddb404a 100644
--- a/manpages/pot/lh_chroot_tasks.1.pot
+++ b/manpages/pot/lh_chroot_tasks.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_chroot_upstart.1.pot b/manpages/pot/lh_chroot_upstart.1.pot
index 7b7e01e..a5ccbb4 100644
--- a/manpages/pot/lh_chroot_upstart.1.pot
+++ b/manpages/pot/lh_chroot_upstart.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_clean.1.pot b/manpages/pot/lh_clean.1.pot
index 8b89575..3e61211 100644
--- a/manpages/pot/lh_clean.1.pot
+++ b/manpages/pot/lh_clean.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_config.1.pot b/manpages/pot/lh_config.1.pot
index 19fac58..013daa2 100644
--- a/manpages/pot/lh_config.1.pot
+++ b/manpages/pot/lh_config.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_local.1.pot b/manpages/pot/lh_local.1.pot
index ccbeaaa..1eddc41 100644
--- a/manpages/pot/lh_local.1.pot
+++ b/manpages/pot/lh_local.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_source.1.pot b/manpages/pot/lh_source.1.pot
index ee46ce5..3d50f64 100644
--- a/manpages/pot/lh_source.1.pot
+++ b/manpages/pot/lh_source.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_source_checksums.1.pot b/manpages/pot/lh_source_checksums.1.pot
index 46e83b2..5a68e9e 100644
--- a/manpages/pot/lh_source_checksums.1.pot
+++ b/manpages/pot/lh_source_checksums.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_source_debian-live.1.pot b/manpages/pot/lh_source_debian-live.1.pot
index 9dd713f..ee9cae5 100644
--- a/manpages/pot/lh_source_debian-live.1.pot
+++ b/manpages/pot/lh_source_debian-live.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_source_debian.1.pot b/manpages/pot/lh_source_debian.1.pot
index 7fffcd0..225dd70 100644
--- a/manpages/pot/lh_source_debian.1.pot
+++ b/manpages/pot/lh_source_debian.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_source_disk.1.pot b/manpages/pot/lh_source_disk.1.pot
index be4969d..bda93ef 100644
--- a/manpages/pot/lh_source_disk.1.pot
+++ b/manpages/pot/lh_source_disk.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_source_iso.1.pot b/manpages/pot/lh_source_iso.1.pot
index 104cecf..3a4839f 100644
--- a/manpages/pot/lh_source_iso.1.pot
+++ b/manpages/pot/lh_source_iso.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_source_net.1.pot b/manpages/pot/lh_source_net.1.pot
index c861404..f0815e8 100644
--- a/manpages/pot/lh_source_net.1.pot
+++ b/manpages/pot/lh_source_net.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_source_tar.1.pot b/manpages/pot/lh_source_tar.1.pot
index 5e8f0fe..0e3cc12 100644
--- a/manpages/pot/lh_source_tar.1.pot
+++ b/manpages/pot/lh_source_tar.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_source_usb.1.pot b/manpages/pot/lh_source_usb.1.pot
index 4dee71b..d83dc9a 100644
--- a/manpages/pot/lh_source_usb.1.pot
+++ b/manpages/pot/lh_source_usb.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_source_virtual-hdd.1.pot b/manpages/pot/lh_source_virtual-hdd.1.pot
index a283a72..e2f162f 100644
--- a/manpages/pot/lh_source_virtual-hdd.1.pot
+++ b/manpages/pot/lh_source_virtual-hdd.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/lh_testroot.1.pot b/manpages/pot/lh_testroot.1.pot
index 5117bff..0d4b8ec 100644
--- a/manpages/pot/lh_testroot.1.pot
+++ b/manpages/pot/lh_testroot.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/manpages/pot/live-helper.7.pot b/manpages/pot/live-helper.7.pot
index 93fd63a..4cc1e10 100644
--- a/manpages/pot/live-helper.7.pot
+++ b/manpages/pot/live-helper.7.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-helper VERSION\n"
-"POT-Creation-Date: 2010-07-18 01:12+0300\n"
+"POT-Creation-Date: 2010-07-24 17:25+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
 "Language-Team: LANGUAGE <LL at li.org>\n"
@@ -82,7 +82,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2010-07-18"
+msgid "2010-07-24"
 msgstr ""
 
 #. type: TH
@@ -117,7 +117,7 @@ msgstr ""
 #: en/lh_source_net.1:1 en/lh_source_tar.1:1 en/lh_source_usb.1:1
 #: en/lh_source_virtual-hdd.1:1 en/lh_testroot.1:1 en/live-helper.7:1
 #, no-wrap
-msgid "2.0~a19"
+msgid "2.0~a20"
 msgstr ""
 
 #. type: TH
diff --git a/po/Makefile b/po/Makefile
index c77ddea..3216d1f 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -6,7 +6,7 @@ ECHO_FUNCTIONS="Echo_message Echo_verbose Echo_warning Echo_debug Echo_error Ech
 POFILES=$(wildcard *.po)
 MOFILES=$(patsubst %.po,%.mo,$(POFILES))
 LINGUAS=$(basename $(POFILES))
-GETTEXTFILES=$(shell find ../helpers ../functions -type f)
+GETTEXTFILES=$(shell find ../scripts/build ../functions -type f)
 POTFILE=$(DOMAIN).pot
 DESTDIR=/
 XGETTEXT_KEYWORDS=$(shell echo $(ECHO_FUNCTIONS) |sed -e 's,\S\+,-k&,g')
diff --git a/live-helper.sh b/scripts/build.sh
similarity index 100%
rename from live-helper.sh
rename to scripts/build.sh
diff --git a/scripts/build/binary b/scripts/build/binary
new file mode 100755
index 0000000..41199dc
--- /dev/null
+++ b/scripts/build/binary
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+# lh_binary(1) - build binary images
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'build binary images')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Setup cleanup function
+Setup_cleanup
+
+# Preparing root filesystem
+lh binary_chroot ${*}
+
+if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
+then
+	# Configuring chroot
+	lh chroot_devpts install ${*}
+	lh chroot_proc install ${*}
+	lh chroot_selinuxfs install ${*}
+	lh chroot_sysfs install ${*}
+	lh chroot_hosts install ${*}
+	lh chroot_resolv install ${*}
+	lh chroot_hostname install ${*}
+	lh chroot_sysv-rc install ${*}
+	lh chroot_upstart install ${*}
+	lh chroot_apt install-binary ${*}
+	lh chroot_sources install ${*}
+fi
+
+# Building root filesystem
+lh binary_rootfs ${*}
+lh binary_manifest ${*}
+lh binary_encryption ${*}
+
+# Prepare images
+lh binary_local-packageslists ${*}
+lh binary_linux-image ${*}
+lh binary_debian-installer ${*}
+lh binary_memtest ${*}
+lh binary_grub ${*}
+lh binary_grub2 ${*}
+lh binary_syslinux ${*}
+lh binary_yaboot ${*}
+lh binary_silo ${*}
+lh binary_disk ${*}
+lh binary_win32-loader ${*}
+lh binary_includes ${*}
+lh binary_local-includes ${*}
+lh binary_local-hooks ${*}
+lh binary_checksums ${*}
+
+if [ "${LH_BUILD_WITH_CHROOT}" != "true" ]
+then
+	lh chroot_devpts install ${*}
+	lh chroot_proc install ${*}
+	lh chroot_selinuxfs install ${*}
+	lh chroot_sysfs install ${*}
+fi
+
+# Building images
+lh binary_iso ${*}
+lh binary_net ${*}
+lh binary_tar ${*}
+lh binary_usb ${*}
+lh binary_virtual-hdd ${*}
+
+if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
+then
+	# Deconfiguring chroot
+	rm -f .stage/chroot_sources
+	lh chroot_hostname remove ${*}
+	lh chroot_resolv remove ${*}
+	lh chroot_hosts remove ${*}
+fi
+
+lh chroot_apt remove ${*}
+lh chroot_sysv-rc remove ${*}
+lh chroot_sysfs remove ${*}
+lh chroot_upstart remove ${*}
+lh chroot_selinuxfs remove ${*}
+lh chroot_proc remove ${*}
+lh chroot_devpts remove ${*}
diff --git a/scripts/build/binary_checksums b/scripts/build/binary_checksums
new file mode 100755
index 0000000..8fec891
--- /dev/null
+++ b/scripts/build/binary_checksums
@@ -0,0 +1,84 @@
+#!/bin/sh
+
+# lh_binary_checksums(1) - create binary checksums
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'create binary checksums')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_CHECKSUMS}" = "none" ] || [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ]
+then
+	exit 0
+fi
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_checksums
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+for CHECKSUM in ${LH_CHECKSUMS}
+do
+	Echo_message "Begin creating binary ${CHECKSUM}sum.txt..."
+
+	# Remove old checksums
+	if [ -f binary/${CHECKSUM}sum.txt ]
+	then
+		rm -f binary/${CHECKSUM}sum.txt
+	fi
+
+	# Calculating checksums
+	cd binary
+	find . -type f \
+		\! -path './isolinux/isolinux.bin' \
+		\! -path './boot/grub/stage2_eltorito' \
+		\! -path './md5sum.txt' \
+		\! -path './sha1sum.txt' \
+		\! -path './sha256sum.txt' \
+	-print0 | sort -z | xargs -0 ${CHECKSUM}sum > ../${CHECKSUM}sum.txt
+
+cat > ${CHECKSUM}sum.txt << EOF
+This file contains the list of ${CHECKSUM} checksums of all files on this medium.
+
+You can verify them automatically with the 'integrity-check' boot parameter,
+or, manually with: '${CHECKSUM}sum -c ${CHECKSUM}sum.txt'.
+
+
+EOF
+
+	cat ../${CHECKSUM}sum.txt >> ${CHECKSUM}sum.txt
+	rm -f ../${CHECKSUM}sum.txt
+
+	cd "${OLDPWD}"
+done
+
+# File list
+cd binary
+find . | sed -e 's|^.||g' | grep "^/" | sort > ../binary.list
+cd "${OLDPWD}"
+
+# Creating stage file
+Create_stagefile .stage/binary_checksums
diff --git a/scripts/build/binary_chroot b/scripts/build/binary_chroot
new file mode 100755
index 0000000..88f3773
--- /dev/null
+++ b/scripts/build/binary_chroot
@@ -0,0 +1,122 @@
+#!/bin/sh
+
+# lh_binary_chroot(1) - copy chroot into chroot
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'copy chroot into chroot')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin copying chroot..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_chroot
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Normally, virtual filesystems are not mounted here, but people tend to be lazy
+if [ -f chroot/proc/version ]
+then
+	if [ "${LH_USE_FAKEROOT}" != "true" ]
+then
+		${LH_ROOT_COMMAND} umount chroot/proc
+	else
+		rm -rf chroot/proc
+		mkdir -p chroot/proc
+	fi
+fi
+
+if [ -d chroot/sys/kernel ]
+then
+	if [ "${LH_USE_FAKEROOT}" != "true" ]
+	then
+		${LH_ROOT_COMMAND} umount chroot/sys
+	else
+		rm -rf chroot/sys
+		mkdir -p chroot/sys
+	fi
+fi
+
+# Copying /dev if using fakeroot
+if [ "${LH_USE_FAKEROOT}" = "true" ]
+then
+	rm -rf chroot/dev
+	find /dev | cpio -dmpu chroot
+fi
+
+if [ "${LH_BUILD_WITH_CHROOT}" = "false" ]
+then
+	exit 0
+fi
+
+if [ "${LH_CACHE}" = "true" ] && Find_files cache/stages_rootfs/filesystem*
+then
+	exit 0
+fi
+
+Echo_message "This may take a while."
+
+# Removing old chroot
+${LH_ROOT_COMMAND} rm -rf chroot/chroot
+${LH_ROOT_COMMAND} rm -rf chroot.tmp
+
+# Copying new chroot
+if [ -d cache/stages_bootstrap ] && [ "${LH_CHROOT_FILESYSTEM}" != "plain" ]
+then
+	${LH_ROOT_COMMAND} mv chroot chroot.tmp
+	${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot
+	${LH_ROOT_COMMAND} touch chroot/chroot.cache
+else
+	${LH_ROOT_COMMAND} cp -a chroot chroot.tmp
+fi
+
+${LH_ROOT_COMMAND} mv chroot.tmp chroot/chroot
+
+# Handling chroot excludes
+if [ -f config/binary_rootfs/excludes ]
+then
+	case "${LH_BUILD_WITH_CHROOT}" in
+		true)
+			cp config/binary_rootfs/excludes chroot/chroot/excludes
+			chroot chroot/chroot /usr/bin/env -i xargs --arg-file=/excludes -I FILE bash -c 'rm -rf FILE'
+			rm -f chroot/chroot/excludes
+			;;
+
+		false)
+			cp config/binary_rootfs/excludes chroot/excludes
+			chroot chroot /usr/bin/env -i xargs --arg-file=/excludes -I FILE bash -c 'rm -rf FILE'
+			rm -f chroot/excludes
+			;;
+	esac
+fi
+
+if [ -n "${LH_ROOT_COMMAND}" ]
+then
+	${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
+fi
+
+# Creating stage file
+Create_stagefile .stage/binary_chroot
diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer
new file mode 100755
index 0000000..fa7b022
--- /dev/null
+++ b/scripts/build/binary_debian-installer
@@ -0,0 +1,686 @@
+#!/bin/sh
+
+# lh_binary_debian-installer(1) - install debian-installer into binary
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'install debian-installer into binary')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ]
+then
+	exit 0
+fi
+
+if [ "${_DEBUG}" = "true" ]
+then
+	WGET_OPTIONS="${WGET_OPTIONS} --verbose"
+elif [ "${_QUIET}" = "true" ]
+then
+	WGET_OPTIONS="${WGET_OPTIONS} --quiet"
+else
+	WGET_OPTIONS="${WGET_OPTIONS} --no-verbose"
+fi
+
+# Check d-i configuration
+case "${LH_DEBIAN_INSTALLER}" in
+	true|cdrom|netinst|netboot|businesscard|live)
+		;;
+
+	false)
+		exit 0
+		;;
+
+	*)
+		Echo_error "debian-installer flavour %s not supported." "${LH_DEBIAN_INSTALLER}"
+		exit 1
+		;;
+esac
+
+Echo_message "Begin installing debian-installer..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_debian-installer
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Checking depends
+Check_package chroot/usr/bin/wget wget
+Check_package chroot/usr/bin/apt-ftparchive apt-utils
+
+# Restoring cache
+Restore_cache cache/packages_binary
+
+# Installing depends
+Install_package
+
+# Setting destination directory
+case "${LH_BINARY_IMAGES}" in
+	net)
+		DESTDIR="tftpboot/debian-install/${LH_ARCHITECTURE}"
+		;;
+
+	usb*|tar)
+		DESTDIR="binary/install"
+		;;
+
+	*)
+		DESTDIR="binary/install"
+		;;
+esac
+
+# Set d-i image type
+case "${LH_DEBIAN_INSTALLER}" in
+	businesscard|netboot|netinst)
+		DI_IMAGE_TYPE="netboot"
+		;;
+	*)
+		case "${LH_BINARY_IMAGES}" in
+			net)
+				DI_IMAGE_TYPE="netboot"
+				;;
+
+			*)
+				DI_IMAGE_TYPE="cdrom"
+				;;
+		esac
+		;;
+esac
+
+# Set architecture-specific variables
+case "${LH_ARCHITECTURE}" in
+	powerpc)
+		case "${DI_IMAGE_TYPE}" in
+			cdrom)
+				DI_REMOTE_BASE="${LH_ARCHITECTURE}/cdrom"
+			;;
+
+			netboot)
+				DI_REMOTE_BASE="${LH_ARCHITECTURE}/netboot"
+				;;
+		esac
+
+		DI_REMOTE_KERNEL="vmlinux"
+		DI_REMOTE_BASE_GTK="${DI_REMOTE_BASE}/gtk"
+		;;
+
+	sparc)
+		DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
+		DI_REMOTE_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
+		DI_REMOTE_BASE_GTK="none"
+
+		DI_REMOTE_BASE="cdrom"
+		;;
+	*)
+		case "${DI_IMAGE_TYPE}" in
+			netboot)
+				DI_REMOTE_BASE="netboot/debian-installer/${LH_ARCHITECTURE}"
+				DI_REMOTE_BASE_GTK="netboot/gtk/debian-installer/${LH_ARCHITECTURE}"
+				DI_REMOTE_KERNEL="linux"
+				;;
+
+			cdrom)
+				DI_REMOTE_BASE="cdrom"
+				DI_REMOTE_BASE_GTK="cdrom/gtk"
+				DI_REMOTE_KERNEL="vmlinuz"
+				;;
+		esac
+		;;
+esac
+
+Check_multiarchitecture
+
+Install_file() {
+	local FILE
+	FILE="${1}"
+
+	local TARGET
+	TARGET="${2}"
+
+	SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')"
+
+	if [ -z "${SOURCE}" ]
+	then
+		SOURCE="$(basename ${FILE} | awk -F_ '{ print $1 }')"
+	fi
+
+	case "${SOURCE}" in
+		lib?*)
+			LETTER="$(echo ${SOURCE} | sed 's|\(....\).*|\1|')"
+			;;
+
+		*)
+			LETTER="$(echo ${SOURCE} | sed 's|\(.\).*|\1|')"
+			;;
+	esac
+
+	# Install directory
+	mkdir -p "${TARGET}"/"${LETTER}"/"${SOURCE}"
+
+	# Move files
+	cp "${FILE}" "${TARGET}"/"${LETTER}"/"${SOURCE}"
+}
+
+# Set absolute directory for caching; we require it when we call Download_file
+# from a non-standard cwd.
+_LH_CACHE_DIR="$(pwd)/cache/binary_debian-installer"
+
+Download_file () {
+	local _LH_TARGET
+	_LH_TARGET="${1}"
+
+	local _LH_URL
+	_LH_URL="${2}"
+
+	_LH_CACHE_FILE="${_LH_CACHE_DIR}/$(echo "${_LH_URL}" | sed 's|/|_|g')"
+
+	if [ ! -f "${_LH_CACHE_FILE}" ]
+	then
+		mkdir -p ${_LH_CACHE_DIR}
+		if ! wget ${WGET_OPTIONS} -O "${_LH_CACHE_FILE}" "${_LH_URL}"
+		then
+			rm -f "${_LH_CACHE_FILE}"
+
+			Echo_error "Could not download file: %s" "${_LH_URL}"
+			exit 1
+		fi
+	fi
+
+	if [ "$(stat --printf %d "${_LH_CACHE_DIR}")" = "$(stat --printf %d ./)" ]
+	then
+		CP_OPTIONS="-l"
+	fi
+
+	cp -f ${CP_OPTIONS} -- "${_LH_CACHE_FILE}" "${_LH_TARGET}"
+}
+
+VMLINUZ_DI="vmlinuz"
+INITRD_DI="initrd.gz"
+DESTDIR_DI="${DESTDIR}"
+
+VMLINUZ_GI="gtk/vmlinuz"
+INITRD_GI="gtk/initrd.gz"
+DESTDIR_GI="${DESTDIR}/gtk"
+
+if [ "${LH_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ]
+then
+	LH_DEBIAN_INSTALLER_DISTRIBUTION="sid"
+
+	# Debian Installer daily builds
+	case "${LH_ARCHITECTURE}" in
+		alpha|amd64|hppa|ia64|mips|mipsel|powerpc)
+			URL="http://d-i.debian.org/daily-images/${LH_ARCHITECTURE}/daily/"
+			;;
+
+		arm|armel)
+			URL="http://people.debian.org/~kmuto/d-i/images/daily/"
+			;;
+
+		i386)
+			URL="http://people.debian.org/~joeyh/d-i/images/daily/"
+			;;
+
+		m68k)
+			URL="http://people.debian.org/~smarenka/d-i/images-m68k/daily/"
+			;;
+
+		s390)
+			URL="http://lophos.multibuild.org/d-i/images/daily/"
+			;;
+
+		sparc)
+			URL="http://people.debian.org/~stappers/d-i/images/daily/"
+			;;
+
+		*)
+			Echo_error "No daily-builds found for your architecture."
+			exit 1
+			;;
+	esac
+else
+	URL="${LH_MIRROR_DEBIAN_INSTALLER}/dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LH_ARCHITECTURE}/current/images/"
+fi
+
+mkdir -p "${DESTDIR_DI}"
+
+if [ "${LH_ARCHITECTURE}" = "sparc" ] && [ "${DI_IMAGE_TYPE}" = "netboot" ]
+then
+	# There are no prepared kernel/initrd pairs for sparc netboot so we
+	# must unpack them from a mini.iso
+	Download_file mini.iso ${URL}/mini.iso
+
+	mkdir mini.tmp
+	${LH_ROOT_COMMAND} mount -o loop -t iso9660 mini.iso mini.tmp
+
+	cp mini.tmp/boot/vmlinuz-${DEFAULT_FLAVOUR} "${DESTDIR}"/"${VMLINUZ_DI}"
+	cp mini.tmp/boot/initrd.gz "${DESTDIR}"/"${INITRD_DI}"
+
+	${LH_ROOT_COMMAND} umount mini.tmp
+	rm -rf mini.tmp mini.iso
+else
+	# Downloading debian-installer
+	Download_file "${DESTDIR}"/"${VMLINUZ_DI}" ${URL}/${DI_REMOTE_BASE}/${DI_REMOTE_KERNEL}
+	Download_file "${DESTDIR}"/"${INITRD_DI}" ${URL}/${DI_REMOTE_BASE}/initrd.gz
+
+	# Downloading graphical-installer
+	DOWNLOAD_GTK_INSTALLER=0
+	if [ "${LH_DEBIAN_INSTALLER_GUI}" = "true" ]
+	then
+		case "${LH_ARCHITECTURE}" in
+			amd64|i386)
+				DOWNLOAD_GTK_INSTALLER=1
+				;;
+
+			powerpc)
+				if [ "${LH_DEBIAN_INSTALLER}" = "netboot" ]
+				then
+					DOWNLOAD_GTK_INSTALLER=1
+				fi
+				;;
+		esac
+	fi
+
+	if [ ${DOWNLOAD_GTK_INSTALLER} -eq 1 ]
+	then
+		mkdir -p "${DESTDIR_GI}"
+		Download_file "${DESTDIR}"/"${VMLINUZ_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/${DI_REMOTE_KERNEL}
+		Download_file "${DESTDIR}"/"${INITRD_GI}" ${URL}/${DI_REMOTE_BASE_GTK}/initrd.gz
+	fi
+fi
+
+# Only download additional packages if appropriate
+if [ "${DI_IMAGE_TYPE}" != "netboot" ]
+then
+	# Downloading additional packages
+	mkdir -p chroot/binary.deb/archives/partial
+	mkdir -p binary/pool/main
+	mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
+	touch chroot/var/lib/dpkg/status
+
+	case "${LH_ARCHITECTURE}" in
+		amd64)
+			#DI_REQ_PACKAGES="lilo grub grub2"
+			DI_REQ_PACKAGES="lilo grub"
+
+			case "${LH_MODE}" in
+				ubuntu)
+					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-generic"
+					;;
+
+				*)
+					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-amd64"
+					;;
+			esac
+			;;
+
+		i386)
+			#DI_REQ_PACKAGES="elilo lilo grub grub2"
+			DI_REQ_PACKAGES="elilo lilo grub"
+
+			case "${LH_MODE}" in
+				ubuntu)
+					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-generic"
+					;;
+
+				*)
+					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-486 linux-image-2.6-686"
+					;;
+			esac
+			;;
+
+		sparc)
+			DI_REQ_PACKAGES="silo"
+			DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-sparc64 linux-image-2.6-sparc64-smp"
+			;;
+
+		powerpc)
+			DI_REQ_PACKAGES="yaboot"
+			DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-powerpc linux-image-2.6-powerpc64 linux-image-2.6-powerpc-smp"
+			;;
+	esac
+
+	DI_PACKAGES="${DI_PACKAGES} busybox cryptsetup lvm2"
+
+	# Set apt command prefix
+	_LH_APT_COMMAND="apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb -o APT::Install-Recommends=false --download-only"
+
+	if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
+	then
+		# We don't want to duplicate .debs of packages in binary/pool that are already
+		# installed to target/ via live-installer.
+		#
+		# However, we need to force various packages' inclusion in binary/pool/main as
+		# d-i does not support (for example) re-installing grub from target/ - the grub
+		# .debs must actually exist.
+
+		# Modify dpkg status to show the required packages are not installed.
+		cp chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
+		for PACKAGE in ${DI_REQ_PACKAGES}
+		do
+			awk -v f=0 '
+				f == 1 { print "Status: purge ok not-installed"; f=0; next }
+				/Package: '"${PACKAGE}"'/ { f=1; }
+				{ print }
+				' chroot/var/lib/dpkg/status > chroot/var/lib/dpkg/status.awk
+			mv chroot/var/lib/dpkg/status.awk chroot/var/lib/dpkg/status
+		done
+
+		# Download .deb's that we just marked as "purged" which caused broken dependencies
+		Chroot chroot ${_LH_APT_COMMAND} -f dist-upgrade
+
+		# Revert dpkg status file
+		mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
+
+		# Download .debs of the required packages
+		Chroot chroot ${_LH_APT_COMMAND} install ${DI_REQ_PACKAGES}
+	else
+		# Download .debs of the required packages
+		Chroot chroot ${_LH_APT_COMMAND} install ${DI_PACKAGES}
+
+		# Revert dpkg status file
+		mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
+	fi
+
+	mv chroot/binary.deb ./
+
+	if Find_files binary.deb/archives/*.deb
+	then
+		for FILE in binary.deb/archives/*.deb
+		do
+			Install_file "${FILE}" "binary/pool/main"
+		done
+	fi
+
+	if [ "${LH_DEBIAN_INSTALLER}" != "live" ]
+	then
+		# Including base debian packages
+		if ls cache/packages_bootstrap/*.deb > /dev/null 2>&1
+		then
+			for FILE in cache/packages_bootstrap/*.deb
+			do
+				Install_file "${FILE}" "binary/pool/main"
+			done
+		else
+			Echo_error "Could not find packages in cache/packages_bootstrap."
+			Echo_error "You selected values of LH_CACHE, LH_CACHE_PACKAGES, LH_CACHE_STAGES and LH_DEBIAN_INSTALLER which will result in 'bootstrap' packages not being cached - these are required when integrating the Debian Installer."
+			exit 1
+		fi
+	fi
+
+	# Including local debs
+	if Find_files config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb
+	then
+		for FILE in config/binary_local-debs/*_"${LH_ARCHITECTURE}".deb
+		do
+			Install_file "${FILE}" "binary/pool/main"
+		done
+	fi
+
+	if Find_files config/binary_local-debs/*_all.deb
+	then
+		for FILE in config/binary_local-debs/*_all.deb
+		do
+			Install_file "${FILE}" "binary/pool/main"
+		done
+	fi
+
+	# Generating deb indices
+	mkdir -p binary/dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}
+
+	mv binary chroot/root
+	echo "cd /root/binary && apt-ftparchive packages pool/main > dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}/Packages" > chroot/binary.sh
+	Chroot chroot "sh binary.sh"
+	rm -f chroot/binary.sh
+	mv chroot/root/binary ./
+
+	gzip -9 -c binary/dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}/Packages > binary/dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}/Packages.gz
+
+	# Fetching release
+	Download_file binary/dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/binary-${LH_ARCHITECTURE}/Release "${LH_MIRROR_CHROOT}"/dists/"${LH_DEBIAN_INSTALLER_DISTRIBUTION}"/main/binary-"${LH_ARCHITECTURE}"/Release
+
+	mkdir binary.udeb
+	cd binary.udeb
+
+	# Downloading udeb indices
+	Download_file Packages.gz "${LH_MIRROR_CHROOT}"/dists/"${LH_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LH_ARCHITECTURE}"/Packages.gz
+	gunzip -c Packages.gz > Packages
+
+	# Sorting udebs
+	UDEBS="$(awk '/Filename: / { print $2 }' Packages)"
+
+	# Downloading udebs
+	for UDEB in ${UDEBS}
+	do
+		if [ -f ../cache/packages_debian-installer.udeb/"$(basename ${UDEB})" ]
+		then
+			# Copying cached udebs
+			cp ../cache/packages_debian-installer.udeb/"$(basename ${UDEB})" ./
+		else
+			# Downloading udebs
+			wget ${WGET_OPTIONS} "${LH_MIRROR_CHROOT}"/${UDEB}
+		fi
+	done
+
+	# Caching udebs
+	rm -rf ../cache/packages_debian-installer.udeb
+	mkdir -p ../cache/packages_debian-installer.udeb
+	cp *.udeb ../cache/packages_debian-installer.udeb
+
+	# Including local udebs
+	if Find_files ../config/binary_local-udebs/*_"${LH_ARCHITECTURE}".udeb
+	then
+		for FILE in ../config/binary_local-udebs/*_"${LH_ARCHITECTURE}".udeb
+		do
+			Install_file "${FILE}" "pool/main"
+
+			# Prefer local udebs over downloaded udebs
+			rm -f "$(basename ${FILE} | awk -F_ '{ print $1 }')"_*.udeb
+		done
+	fi
+
+	if Find_files ../config/binary_local-udebs/*_all.udeb
+	then
+		for FILE in ../config/binary_local-udebs/*_all.udeb
+		do
+			Install_file "${FILE}" "pool/main"
+
+			# Prefer local udebs over downloaded udebs
+			rm -f "$(basename ${FILE} | awk -F_ '{ print $1 }')"_*.udeb
+		done
+	fi
+
+	# Excluding udebs
+	grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DEBIAN_INSTALLER_DISTRIBUTION}"/udeb_exclude > exclude || true
+	grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DEBIAN_INSTALLER_DISTRIBUTION}"/exclude-udebs >> exclude || true
+	grep -v "^#" "${LH_BASE}"/data/debian-cd/"${LH_DEBIAN_INSTALLER_DISTRIBUTION}"/exclude-udebs-${LH_ARCHITECTURE} >> exclude || true
+
+	# Local exclude file
+	if [ -e ../config/binary_debian-installer/udeb_exclude ]
+	then
+		cat ../config/binary_debian-installer/udeb_exclude >> exclude
+	fi
+
+	# Excluding udebs from excludes because we want them to be in the image on purpose
+	sed -i -e 's|di-utils-exit-installer||' exclude # used for live-installer-launcher
+
+	while read EXCLUDE
+	do
+		if [ "${LH_DEBIAN_INSTALLER}" = "live" ] && [ "${EXCLUDE}" = "live-installer" ]
+		then
+			continue
+		fi
+
+		rm -f ${EXCLUDE}_*.udeb
+	done < exclude
+
+	# Enable live-installer
+	if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
+	then
+		# Remove local udebs
+		rm -f pool/main/b/base-installer/bootstrap-base_*.udeb
+
+		# Remove d-i udebs
+		rm -f bootstrap-base_*.udeb
+	fi
+
+	# Moving udebs
+	for UDEB in ${UDEBS}
+	do
+		if [ -f "$(basename ${UDEB})" ]
+		then
+			mkdir -p $(dirname ${UDEB})
+			mv "$(basename ${UDEB})" "$(dirname ${UDEB})"
+		fi
+	done
+
+	# Creating udeb indices
+	mkdir -p dists/"${LH_DEBIAN_INSTALLER_DISTRIBUTION}"/main/debian-installer/binary-"${LH_ARCHITECTURE}"
+	cd "${OLDPWD}"
+
+	mv binary.udeb chroot/root
+	echo "cd /root/binary.udeb && apt-ftparchive packages pool/main > dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LH_ARCHITECTURE}/Packages" > chroot/binary.sh
+	Chroot chroot "sh binary.sh"
+	rm -f chroot/binary.sh
+	mv chroot/root/binary.udeb ./
+
+	cd binary.udeb
+	gzip -9 -c dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LH_ARCHITECTURE}/Packages > dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/main/debian-installer/binary-${LH_ARCHITECTURE}/Packages.gz
+
+	rm -f Packages* exclude
+	find . | cpio -dmpu "${OLDPWD}"/binary
+	cd "${OLDPWD}"
+
+	rm -rf binary.udeb
+	rm -rf binary.deb
+
+	# Generating release file
+	mv binary chroot/root
+
+cat > chroot/binary.sh << EOF
+cd /root/binary && apt-ftparchive \
+	-o APT::FTPArchive::Release::Origin="Debian" \
+	-o APT::FTPArchive::Release::Label="Debian" \
+	-o APT::FTPArchive::Release::Suite="${LH_DEBIAN_INSTALLER_DISTRIBUTION}" \
+	-o APT::FTPArchive::Release::Version="4.0" \
+	-o APT::FTPArchive::Release::Codename="${LH_DEBIAN_INSTALLER_DISTRIBUTION}" \
+	-o APT::FTPArchive::Release::Date="$(date -R)" \
+	-o APT::FTPArchive::Release::Architectures="${LH_ARCHITECTURE}" \
+	-o APT::FTPArchive::Release::Components="main" \
+	-o APT::FTPArchive::Release::Description="Last updated: $(date -R)" \
+	release dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION} > dists/${LH_DEBIAN_INSTALLER_DISTRIBUTION}/Release
+EOF
+
+	Chroot chroot "sh binary.sh"
+	rm -f chroot/binary.sh
+	mv chroot/root/binary ./
+
+	# Creating dist symlinks
+	for DISTRIBUTION in frozen stable testing unstable
+	do
+		ln -s ${LH_DEBIAN_INSTALLER_DISTRIBUTION} binary/dists/${DISTRIBUTION}
+	done
+
+	case "${LH_BINARY_IMAGES}" in
+		usb*)
+			;;
+
+		*)
+			ln -s . binary/debian
+			;;
+	esac
+
+	# Including preseeding files
+	if Find_files config/binary_debian-installer/*.cfg
+	then
+		cp config/binary_debian-installer/*.cfg binary/install
+	fi
+fi
+
+Repack_initrd()
+{
+	local TARGET_INITRD
+	local INCLUDE_PATH
+	TARGET_INITRD="${1}"
+	INCLUDE_PATH="${2}"
+	REPACK_TMPDIR="unpacked-initrd"
+
+	if [ -d "${INCLUDE_PATH}" ]
+	then
+		INCLUDE_PATH=$(readlink -f ${INCLUDE_PATH})
+	fi
+
+	# cpio does not have a "extract to directory", so we must change directory
+	mkdir -p ${REPACK_TMPDIR}
+	cd ${REPACK_TMPDIR}
+
+	gzip -d < ../${TARGET_INITRD} | cpio -i --make-directories --no-absolute-filenames
+	if [ ! -d "${INCLUDE_PATH}" ]
+	then
+		# Invoked the old way, just copy the preseeds
+		cp ../config/binary_debian-installer/*.cfg .
+	else
+		# New way, include target directory content in the initrd
+		REPACK_TMPDIR_ABS="${PWD}"
+		cd "${INCLUDE_PATH}"
+		find -print0 | cpio -pumd0 --no-preserve-owner "${REPACK_TMPDIR_ABS}/"
+		cd "${OLDPWD}"
+	fi
+	find -print0 | cpio -H newc -o0 | gzip -9 > ../${TARGET_INITRD}
+
+	cd ..
+	rm -rf ${REPACK_TMPDIR}
+}
+
+# Preseed d-i by repacking the initrd in certain situations
+if [ "${DI_IMAGE_TYPE}" = "netboot" ] && [ -e config/binary_debian-installer/preseed.cfg ]
+then
+	Repack_initrd "${DESTDIR}"/"${INITRD_DI}"
+
+	if [ -e "${DESTDIR}"/"${INITRD_GI}" ]
+	then
+		Repack_initrd "${DESTDIR}"/"${INITRD_GI}"
+	fi
+fi
+
+# Include content of config/binary_debian-installer-includes if exists and not empty
+if [ -d config/binary_debian-installer-includes ] && [ -n "$(ls -A config/binary_debian-installer-includes)" ]
+then
+	Repack_initrd "${DESTDIR}"/"${INITRD_DI}" config/binary_debian-installer-includes
+
+	if [ -e "${DESTDIR}"/"${INITRD_GI}" ]
+	then
+		Repack_initrd "${DESTDIR}"/"${INITRD_GI}" config/binary_debian-installer-includes
+	fi
+fi
+
+# Saving cache
+Save_cache cache/packages_binary
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_debian-installer
diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk
new file mode 100755
index 0000000..e262c20
--- /dev/null
+++ b/scripts/build/binary_disk
@@ -0,0 +1,137 @@
+#!/bin/sh
+
+# lh_binary_disk (1) - install disk information into binary
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'install disk information into binary')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+case "${LH_BINARY_IMAGES}" in
+	iso*|usb*)
+		;;
+	*)
+		exit 0
+		;;
+esac
+
+Echo_message "Begin installing disk information..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_disk
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+mkdir -p binary/.disk
+
+ARCHITECTURE="$(echo ${LH_ARCHITECTURE} | sed -e 's| |/|g')"
+DISTRIBUTION="$(echo ${LH_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
+DISTRIBUTION="${DISTRIBUTION}$(echo ${LH_DISTRIBUTION} | cut -b 2-)"
+eval VERSION="$`echo RELEASE_${LH_DISTRIBUTION}`"
+
+TITLE="Debian GNU/Linux"
+case "${LH_MODE}" in
+	debian)
+		STRING="Official Snapshot ${ARCHITECTURE}"
+		TRACE="project/trace/ftp-master.debian.org"
+		;;
+
+	debian-release)
+		STRING="Official ${ARCHITECTURE}"
+		TRACE="project/trace/ftp-master.debian.org"
+		;;
+
+	ubuntu)
+		TITLE="Ubuntu"
+		STRING="Build ${ARCHITECTURE}"
+		TRACE=""
+		;;
+
+	*)
+		STRING="Snapshot ${ARCHITECTURE}"
+		TRACE=""
+		;;
+esac
+
+if [ -n "${TRACE}" ]
+then
+	echo "$(wget -q ${LH_MIRROR_BOOTSTRAP}/${TRACE} -O - | head -n 1)" \
+	> binary/.disk/archive_trace
+fi
+
+case "${LH_DEBIAN_INSTALLER}" in
+	cdrom)
+		echo "main" > binary/.disk/base_components
+
+		touch binary/.disk/base_installable
+
+		echo "full_cd" > binary/.disk/cd_type
+
+		echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/CD Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
+
+		cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_udeb_include binary/.disk/udeb_include
+		;;
+
+	true|netinst|live)
+		echo "main" > binary/.disk/base_components
+
+		touch binary/.disk/base_installable
+
+		echo "not_complete" > binary/.disk/cd_type
+
+		if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
+		then
+			echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/INSTALL Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
+		else
+			echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/NETINST Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
+
+		fi
+
+		cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_netinst_udeb_include binary/.disk/udeb_include
+
+		if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
+		then
+			echo "live-installer" >> binary/.disk/udeb_include
+		fi
+		;;
+
+	businesscard)
+		echo "main" > binary/.disk/base_components
+
+		echo "not_complete" > binary/.disk/cd_type
+
+		echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/BC Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
+
+		cp "${LH_BASE}"/data/debian-cd/${LH_DISTRIBUTION}/${LH_ARCHITECTURE}_businesscard_udeb_include binary/.disk/udeb_include
+		;;
+
+	false)
+		echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE Binary $(date +%Y%m%d-%H:%M)" > binary/.disk/info
+		;;
+esac
+
+# Creating stage file
+Create_stagefile .stage/binary_disk
diff --git a/scripts/build/binary_encryption b/scripts/build/binary_encryption
new file mode 100755
index 0000000..8041986
--- /dev/null
+++ b/scripts/build/binary_encryption
@@ -0,0 +1,146 @@
+#!/bin/sh
+
+# lh_binary_encryption(1) - encrypts rootfs
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'encrypts rootfs')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ]
+then
+	exit 0
+fi
+
+case "${LH_ENCRYPTION}" in
+	aes128|aes192|aes256)
+		;;
+	""|false)
+		exit 0
+		;;
+	*)
+		Echo_error "Encryption type %s not supported." "${LH_ENCRYPTION}"
+		exit 1
+		;;
+esac
+
+case "${LH_CHROOT_FILESYSTEM}" in
+	ext2|squashfs)
+		;;
+
+	*)
+		Echo_error "Encryption not yet supported on %s filesystems." "${LH_CHROOT_FILESYSTEM}"
+		exit 1
+		;;
+esac
+
+Echo_message "Begin encrypting root filesystem image..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap .stage/binary_rootfs
+
+# Checking stage file
+Check_stagefile .stage/binary_encryption
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+case "${LH_INITRAMFS}" in
+	casper)
+		INITFS="casper"
+		;;
+
+	live-initramfs)
+		INITFS="live"
+		;;
+esac
+
+# Checking depends
+Check_package chroot/usr/bin/aespipe aespipe
+
+# Restoring cache
+Restore_cache cache/packages_binary
+
+# Installing depends
+Install_package
+
+Echo_message "Encrypting binary/%s/filesystem.%s with %s..." "${INITFS}" "${LH_CHROOT_FILESYSTEM}" "${LH_ENCRYPTION}"
+
+if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
+then
+	# Moving image
+	mv binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM} chroot
+fi
+
+while true
+do
+	echo
+	echo " **************************************"
+	Echo " ** Configuring encrypted filesystem **"
+	echo " **************************************"
+	Echo " (Passwords must be at least 20 characters long)"
+	echo
+
+	case "${LH_BUILD_WITH_CHROOT}" in
+		true)
+			if Chroot chroot aespipe -e ${LH_ENCRYPTION} -T \
+				< chroot/filesystem.${LH_CHROOT_FILESYSTEM} \
+				> chroot/filesystem.${LH_CHROOT_FILESYSTEM}.tmp
+			then
+				mv chroot/filesystem.${LH_CHROOT_FILESYSTEM}.tmp binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}
+				break
+			fi
+			;;
+		false)
+			if aespipe -e ${LH_ENCRYPTION} -T \
+				< binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM} \
+				> binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}.tmp
+			then
+				mv binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}.tmp binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}
+				break
+			fi
+			;;
+	esac
+
+	printf "\nThere was an error configuring encryption ... Retry? [Y/n] "
+	read ANSWER
+
+	if [ "$(echo "${ANSWER}" | cut -b1 | tr A-Z a-z)" = "n" ]
+	then
+		unset ANSWER
+		break
+	fi
+done
+	
+# Cleanup temporary filesystems
+rm -f chroot/filesystem.${LH_CHROOT_FILESYSTEM}
+rm -f chroot/filesystem.${LH_CHROOT_FILESYSTEM}.tmp
+rm -f binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}.tmp
+
+# Saving cache
+Save_cache cache/packages_binary
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_encryption
diff --git a/scripts/build/binary_grub b/scripts/build/binary_grub
new file mode 100755
index 0000000..e2f3a58
--- /dev/null
+++ b/scripts/build/binary_grub
@@ -0,0 +1,339 @@
+#!/bin/sh
+
+# lh_binary_grub(1) - installs grub into binary
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'installs grub into binary')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_BOOTLOADER}" != "grub" ]
+then
+	exit 0
+fi
+
+Echo_message "Begin installing grub..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_grub
+
+# Checking grub templates
+Check_templates grub
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Check architecture
+Check_architecture amd64 i386
+Check_crossarchitecture
+
+# Checking depends
+Check_package chroot/usr/sbin/grub grub
+
+# Restoring cache
+Restore_cache cache/packages_binary
+
+# Installing depends
+Install_package
+
+# Local functions
+Grub_live_entry ()
+{
+	LABEL="${1}"
+	KERNEL="${2}"
+	INITRD="${3}"
+	APPEND="${4}"
+
+	LINUX_LIVE="${LINUX_LIVE}\ntitle\t\tDebian GNU/Linux - ${LABEL}"
+	LINUX_LIVE="${LINUX_LIVE}\nkernel\t\t/${KERNEL} boot=${INITFS} live-config LH_BOOTAPPEND_LIVE ${APPEND}"
+	LINUX_LIVE="${LINUX_LIVE}\ninitrd\t\t/${INITRD}"
+}
+
+Grub_install_entry ()
+{
+	LABEL="${1}"
+	KERNEL="${2}"
+	INITRD="${3}"
+	APPEND="${4}"
+
+	QAPPEND="quiet"
+
+	for TYPE in Install Expert Rescue Auto
+	do
+		case "${TYPE}" in
+			Install)
+				TAPPEND="${APPEND} ${QAPPEND}"
+				;;
+
+			Expert)
+				TAPPEND="priority=low ${APPEND}"
+				;;
+
+			Rescue)
+				TAPPEND="rescue/enable=true ${APPEND} ${QAPPEND}"
+				;;
+
+			Auto)
+				TAPPEND="auto=true priority=critical ${APPEND} ${QAPPEND}"
+				;;
+		esac
+
+		case "${LABEL}" in
+			Text)
+				TYPE_SUFFIX=""
+				;;
+			GUI)
+				TYPE_SUFFIX="gui"
+				;;
+		esac
+
+
+		LINUX_INSTALL="${LINUX_INSTALL}\ntitle\t\t${LABEL} ${TYPE}"
+		LINUX_INSTALL="${LINUX_INSTALL}\nkernel\t\t/${KERNEL} ${TAPPEND} ${LH_BOOTAPPEND_INSTALL}"
+		LINUX_INSTALL="${LINUX_INSTALL}\ninitrd\t\t/${INITRD}"
+	done
+}
+
+case "${LH_INITRAMFS}" in
+	casper)
+		INITFS="casper"
+		;;
+
+	live-initramfs)
+		INITFS="live"
+		;;
+esac
+
+# Setting destination directory
+case "${LH_BINARY_IMAGES}" in
+	iso*|tar)
+		case "${LH_INITRAMFS}" in
+			casper)
+				DESTDIR_LIVE="binary/casper"
+				;;
+
+			live-initramfs)
+				DESTDIR_LIVE="binary/live"
+				;;
+		esac
+
+		DESTDIR_INSTALL="binary/install"
+		;;
+
+	usb*|net)
+		Echo_warning "Bootloader in this image type not yet supported by live-helper."
+		Echo_warning "This would produce a not bootable image, aborting (FIXME)."
+		exit 1
+	;;
+esac
+
+Check_multiarchitecture
+
+# Creating directory
+mkdir -p "${DESTDIR_LIVE}"
+
+# Setting boot parameters
+
+case "${LH_ENCRYPTION}" in
+	""|false)
+		;;
+	*)
+		LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
+esac
+
+if [ -n "${LH_USERNAME}" ]
+then
+	case "${LH_INITRAMFS}" in
+		casper)
+			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
+			;;
+
+		live-initramfs)
+			if [ "${LH_USERNAME}" != "user" ]
+			then
+				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
+			fi
+			;;
+	esac
+fi
+
+if [ -n "${LH_HOSTNAME}" ]
+then
+	case "${LH_INITRAMFS}" in
+		casper)
+			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
+			;;
+
+		live-initramfs)
+			if [ "${LH_HOSTNAME}" != "debian" ]
+			then
+				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
+			fi
+			;;
+	esac
+fi
+
+if [ "${LH_UNION_FILESYSTEM}" != "aufs" ]
+then
+	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}"
+fi
+
+if [ -n "${LH_NET_COW_PATH}" ]
+then
+	Echo_error "Net cow not yet supported on grub"
+	exit 1
+fi
+
+if [ "${LH_EXPOSED_ROOT}" != "false" ]
+then
+	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot"
+fi
+
+LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's|  ||')"
+
+# Parameters are listed at: linux/Documentation/kernel-parameters.txt
+FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal"
+
+# Assembling kernel configuration
+
+# Default entries
+DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
+DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
+DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')"
+
+Grub_live_entry "live" "$(basename ${DESTDIR_LIVE})/${DEFAULT_KERNEL}" "$(basename ${DESTDIR_LIVE})/${DEFAULT_INITRD}"
+Grub_live_entry "live (fail-safe mode)" "$(basename ${DESTDIR_LIVE})/${DEFAULT_KERNEL}" "$(basename ${DESTDIR_LIVE})/${DEFAULT_INITRD}" "${FAILSAFE}"
+
+for KERNEL in chroot/boot/vmlinuz-*
+do
+	VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')"
+
+	Grub_live_entry "live, kernel ${VERSION}" "$(basename ${DESTDIR_LIVE})/$(basename ${KERNEL})" "$(basename ${DESTDIR_LIVE})/initrd.img-${VERSION}"
+	Grub_live_entry "live, kernel ${VERSION} (fail-safe mode)" "$(basename ${DESTDIR_LIVE})/$(basename ${KERNEL})" "$(basename ${DESTDIR_LIVE})/initrd.img-${VERSION}" "${FAILSAFE}"
+done
+
+LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')"
+
+# Assembling debian-installer configuration
+if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
+then
+	LINUX_LIVE="title\t\tLive:\nroot\n\n${LINUX_LIVE}"
+	LINUX_INSTALL="title\t\tInstaller:\nroot"
+
+	VMLINUZ_DI="install/vmlinuz"
+	INITRD_DI="install/initrd.gz"
+	APPEND_DI="vga=normal"
+
+	VMLINUZ_GI="install/gtk/vmlinuz"
+	INITRD_GI="install/gtk/initrd.gz"
+	APPEND_GI="video=vesa:ywrap,mtrr vga=788"
+
+	if [ -f "binary/boot/${VMLINUZ_DI}" ] && [ -f "binary/boot/${INITRD_DI}" ]
+	then
+		Grub_install_entry "Text" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
+	fi
+
+	if [ -f "binary/boot/${VMLINUZ_GI}" ] && [ -f "binary/boot/${INITRD_GI}" ]
+	then
+		Grub_install_entry "GUI" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}"
+	fi
+fi
+
+LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')"
+
+# Assembling memtest configuration
+if [ -f "${DESTDIR_LIVE}"/memtest ]
+then
+	MEMTEST="title\t\tOther:\nroot"
+	MEMTEST="${MEMTEST}\n\ntitle\t\t${LH_MEMTEST}\nkernel\t\t/$(basename ${DESTDIR_LIVE})/memtest"
+	MEMTEST="$(/bin/echo ${MEMTEST} | sed -e 's|//|/|g')"
+fi
+
+# Copying templates
+mkdir -p binary/boot/grub
+cp -r "${TEMPLATES}"/* binary/boot/grub
+
+case ${LH_BINARY_IMAGES} in
+	iso*)
+		FILES="chroot/usr/lib/grub/*/stage2_eltorito"
+		;;
+
+	usb*|tar)
+		FILES="chroot/usr/lib/grub/*/stage1 chroot/usr/lib/grub/*/e2fs_stage1_5 chroot/usr/lib/grub/*/stage2"
+		;;
+esac
+
+if [ "${LH_BUILD_WITH_CHROOT}" = "false" ]
+then
+	FILES="$(echo ${FILES} | sed -e 's|chroot||g')"
+fi
+
+# Copying grub
+cp ${FILES} binary/boot/grub
+
+# Copying local configuration file
+if [ -f config/binary_grub/menu.lst ]
+then
+	cp config/binary_grub/menu.lst binary/boot/grub/menu.lst
+fi
+
+# Copying splash screen
+if [ -f config/binary_grub/splash.xpm.gz ]
+then
+	LH_GRUB_SPLASH="config/binary_grub/splash.xpm.gz"
+elif [ -f config/binary_grub/splash.xpm ]
+then
+	LH_GRUB_SPLASH="config/binary_grub/splash.xpm"
+fi
+
+if [ -n "${LH_GRUB_SPLASH}" ]
+then
+	if [ "${LH_GRUB_SPLASH}" = "none" ]
+	then
+		# Removing splash file
+		rm -f binary/boot/grub/splash.xpm.gz
+
+		# Removing splash entry
+		sed -i -e "s|splashimage.*||" binary/boot/grub/menu.lst
+	else
+		# Overwriting splash file
+		cp -f "${LH_GRUB_SPLASH}" binary/boot/grub
+		sed -i -e "s|splashimage.*|splashimage /boot/grub/$(basename ${LH_GRUB_SPLASH})|" binary/boot/grub/menu.lst
+	fi
+fi
+
+sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" -e "s|MEMTEST|${MEMTEST}|" binary/boot/grub/menu.lst
+sed -i -e "s|LH_BOOTAPPEND_INSTALL|${LH_BOOTAPPEND_INSTALL}|" -e "s|LH_BOOTAPPEND_LIVE|${LH_BOOTAPPEND_LIVE}|" binary/boot/grub/menu.lst
+
+sed -i -e 's|\ $||g' binary/boot/grub/menu.lst
+
+# Saving cache
+Save_cache cache/packages_binary
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_grub
diff --git a/scripts/build/binary_grub2 b/scripts/build/binary_grub2
new file mode 100755
index 0000000..c17730c
--- /dev/null
+++ b/scripts/build/binary_grub2
@@ -0,0 +1,309 @@
+#!/bin/sh
+
+# lh_binary_grub2(1) - installs grub2 into binary
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'installs grub2 into binary')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_BOOTLOADER}" != "grub2" ]
+then
+	exit 0
+fi
+
+Echo_message "Begin installing grub2..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_grub
+
+# Checking grub2 templates
+Check_templates grub2
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Check architecture
+Check_architecture amd64 i386
+Check_crossarchitecture
+
+# Checking depends
+Check_package chroot/usr/bin/grub-mkimage grub-pc
+
+# Restoring cache
+Restore_cache cache/packages_binary
+
+# Installing depends
+Install_package
+
+# Local functions
+Grub_live_entry ()
+{
+	LABEL="${1}"
+	KERNEL="${2}"
+	INITRD="${3}"
+	APPEND="${4}"
+
+	LINUX_LIVE="${LINUX_LIVE}\nmenuentry \"Debian GNU/Linux - ${LABEL}\" {"
+	LINUX_LIVE="${LINUX_LIVE}\nlinux\t\t/${KERNEL} boot=${INITFS} live-config LH_BOOTAPPEND_LIVE ${APPEND}"
+	LINUX_LIVE="${LINUX_LIVE}\ninitrd\t\t/${INITRD}"
+	LINUX_LIVE="${LINUX_LIVE}\n}"
+}
+
+Grub_install_entry ()
+{
+	LABEL="${1}"
+	KERNEL="${2}"
+	INITRD="${3}"
+	APPEND="${4}"
+
+	if [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
+	then
+		APPEND="${APPEND} quiet"
+	fi
+
+	LINUX_INSTALL="${LINUX_INSTALL}\nmenuentry \"Debian GNU/Linux - ${LABEL}\" {"
+	LINUX_INSTALL="${LINUX_INSTALL}\nlinux\t\t/${KERNEL} ${APPEND} LH_BOOTAPPEND_INSTALL"
+	LINUX_INSTALL="${LINUX_INSTALL}\ninitrd\t\t/${INITRD}"
+	LINUX_INSTALL="${LINUX_INSTALL}\n}"
+}
+
+case "${LH_INITRAMFS}" in
+	casper)
+		INITFS="casper"
+		;;
+
+	live-initramfs)
+		INITFS="live"
+		;;
+esac
+
+# Setting destination directory
+case "${LH_BINARY_IMAGES}" in
+	iso*|tar)
+		case "${LH_INITRAMFS}" in
+			casper)
+				DESTDIR_LIVE="binary/casper"
+				;;
+
+			live-initramfs)
+				DESTDIR_LIVE="binary/live"
+				;;
+		esac
+
+		DESTDIR_INSTALL="binary/install"
+		;;
+
+	usb*|net)
+		Echo_warning "Bootloader in this image type not yet supported by live-helper."
+		Echo_warning "This would produce a not bootable image, aborting (FIXME)."
+		exit 1
+	;;
+esac
+
+Check_multiarchitecture
+
+# Creating directory
+mkdir -p "${DESTDIR_LIVE}"
+
+# Setting boot parameters
+
+case "${LH_ENCRYPTION}" in
+	""|false)
+		;;
+	*)
+		LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
+esac
+
+if [ -n "${LH_USERNAME}" ]
+then
+	case "${LH_INITRAMFS}" in
+		casper)
+			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
+			;;
+
+		live-initramfs)
+			if [ "${LH_USERNAME}" != "user" ]
+			then
+				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
+			fi
+			;;
+	esac
+fi
+
+if [ -n "${LH_HOSTNAME}" ]
+then
+	case "${LH_INITRAMFS}" in
+		casper)
+			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
+			;;
+
+		live-initramfs)
+			if [ "${LH_HOSTNAME}" != "debian" ]
+			then
+				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
+			fi
+			;;
+	esac
+fi
+
+if [ "${LH_UNION_FILESYSTEM}" != "aufs" ]
+then
+	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}"
+fi
+
+if [ -n "${LH_NET_COW_PATH}" ]
+then
+	Echo_error "Net cow not yet supported on grub"
+	exit 1
+fi
+
+if [ "${LH_EXPOSED_ROOT}" != "false" ]
+then
+	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot"
+fi
+
+LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's|  ||')"
+
+# Parameters are listed at: linux/Documentation/kernel-parameters.txt
+FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal"
+
+# Assembling kernel configuration
+
+# Default entries
+DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
+DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
+DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')"
+
+Grub_live_entry "live" "$(basename ${DESTDIR_LIVE})/${DEFAULT_KERNEL}" "$(basename ${DESTDIR_LIVE})/${DEFAULT_INITRD}"
+Grub_live_entry "live (fail-safe mode)" "$(basename ${DESTDIR_LIVE})/${DEFAULT_KERNEL}" "$(basename ${DESTDIR_LIVE})/${DEFAULT_INITRD}" "${FAILSAFE}"
+
+for KERNEL in chroot/boot/vmlinuz-*
+do
+	VERSION="$(basename ${KERNEL} | sed -e 's|vmlinuz-||')"
+
+	Grub_live_entry "live, kernel ${VERSION}" "$(basename ${DESTDIR_LIVE})/$(basename ${KERNEL})" "$(basename ${DESTDIR_LIVE})/initrd.img-${VERSION}"
+	Grub_live_entry "live, kernel ${VERSION} (fail-safe mode)" "$(basename ${DESTDIR_LIVE})/$(basename ${KERNEL})" "$(basename ${DESTDIR_LIVE})/initrd.img-${VERSION}" "${FAILSAFE}"
+done
+
+LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')"
+
+# Assembling debian-installer configuration
+if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
+then
+	LINUX_LIVE="#\t \"Live\"\n${LINUX_LIVE}"
+	LINUX_INSTALL="#\t \"Installer\"\n"
+
+	VMLINUZ_DI="install/vmlinuz"
+	INITRD_DI="install/initrd.gz"
+	APPEND_DI="vga=normal"
+
+	VMLINUZ_GI="install/gtk/vmlinuz"
+	INITRD_GI="install/gtk/initrd.gz"
+	APPEND_GI="video=vesa:ywrap,mtrr vga=788"
+
+	Grub_install_entry "install" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
+	Grub_install_entry "installgui" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}"
+	Grub_install_entry "expert" "${VMLINUZ_DI}" "${INITRD_DI}" "priority=low ${APPEND_DI}"
+	Grub_install_entry "expertgui" "${VMLINUZ_GI}" "${INITRD_GI}" "priority=low ${APPEND_GI}"
+	Grub_install_entry "rescue" "${VMLINUZ_DI}" "${INITRD_DI}" "rescue/enable=true ${APPEND_DI}"
+	Grub_install_entry "rescuegui" "${VMLINUZ_GI}" "${INITRD_GI}" "rescue/enable=true ${APPEND_GI}"
+	Grub_install_entry "auto" "${VMLINUZ_DI}" "${INITRD_DI}" "auto=true priority=critical ${APPEND_DI}"
+	Grub_install_entry "autogui" "${VMLINUZ_GI}" "${INITRD_GI}" "auto=true priority=critical ${APPEND_GI}"
+fi
+
+LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')"
+
+# Assembling memtest configuration
+if [ -f "${DESTDIR_LIVE}"/memtest ]
+then
+	MEMTEST="#\t \"Other\"\n"
+	MEMTEST="${MEMTEST}\nmenuentry\t\"${LH_MEMTEST}\" {\nlinux16\t$(basename ${DESTDIR_LIVE})/memtest\n}"
+	MEMTEST="$(/bin/echo ${MEMTEST} | sed -e 's|//|/|g')"
+fi
+
+# Copying templates
+mkdir -p binary/boot/grub
+cp -r "${TEMPLATES}"/* binary/boot/grub
+
+case ${LH_BINARY_IMAGES} in
+	iso*)
+		FILES="chroot/usr/lib/grub/i386-pc/*.mod chroot/usr/lib/grub/i386-pc/*.lst chroot/usr/lib/grub/i386-pc/efiemu??.o chroot/usr/share/grub/*.pf2"
+		;;
+
+	usb*|tar)
+		FILES="chroot/usr/lib/grub/i386-pc/*"
+		;;
+esac
+
+if [ "${LH_BUILD_WITH_CHROOT}" = "false" ]
+then
+	FILES="$(echo ${FILES} | sed -e 's|chroot||g')"
+fi
+
+# Copying grub
+cp ${FILES} binary/boot/grub
+
+# Copying local configuration file
+if [ -f config/binary_grub/grub.cfg ]
+then
+	cp config/binary_grub/grub.cfg binary/boot/grub/grub.cfg
+fi
+
+# Copying splash screen
+if [ -f config/binary_grub/splash.tga ]
+then
+	LH_GRUB_SPLASH="config/binary_grub/splash.tga"
+fi
+
+if [ -n "${LH_GRUB_SPLASH}" ]
+then
+	if [ "${LH_GRUB_SPLASH}" = "none" ]
+	then
+		# Removing splash file
+		rm -f binary/boot/grub/splash.tga
+
+		# Removing splash entry
+		sed -i -e "s|background_image.*||" binary/boot/grub/grub.cfg
+	else
+		# Overwriting splash file
+		cp -f "${LH_GRUB_SPLASH}" binary/boot/grub
+		sed -i -e "s|background_image .*.tga|background_image \$\(root\)/boot/grub/$(basename ${LH_GRUB_SPLASH})|" binary/boot/grub/grub.cfg
+	fi
+fi
+
+sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" -e "s|MEMTEST|${MEMTEST}|" binary/boot/grub/grub.cfg
+sed -i -e "s|LH_BOOTAPPEND_INSTALL|${LH_BOOTAPPEND_INSTALL}|" -e "s|LH_BOOTAPPEND_LIVE|${LH_BOOTAPPEND_LIVE}|" binary/boot/grub/grub.cfg
+
+sed -i -e 's|\ $||g' binary/boot/grub/grub.cfg
+
+# Saving cache
+Save_cache cache/packages_binary
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_grub
diff --git a/scripts/build/binary_includes b/scripts/build/binary_includes
new file mode 100755
index 0000000..d9b82b5
--- /dev/null
+++ b/scripts/build/binary_includes
@@ -0,0 +1,167 @@
+#!/bin/sh
+
+# lh_binary_includes(1) - copy files into binary
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'copy files into binary')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_INCLUDES}" = "none" ]
+then
+	exit 0
+fi
+
+Echo_message "Begin copying binary includes..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_includes
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Check user includes
+if [ ! -d "${LH_INCLUDES}" ]
+then
+	if [ -d ../"${LH_INCLUDES}" ]
+	then
+		LH_INCLUDES="../${LH_INCLUDES}"
+	else
+		Echo_error "user specified includes not accessible in %s" "${LH_INCLUDES}"
+		exit 1
+	fi
+fi
+
+# Checking local includes
+if [ -d config/includes/"${LH_DISTRIBUTION}" ]
+then
+	LH_INCLUDES="config/includes"
+fi
+
+# Assemble architecture
+case "${LH_ARCHITECTURE}" in
+	amd64)
+		ARCH="amd"
+		;;
+
+	i386)
+		ARCH="386"
+		;;
+
+	powerpc)
+		ARCH="ppc"
+		;;
+
+	sparc)
+		ARCH="spa"
+		;;
+esac
+
+# Working arround vfat limitations
+case "${LH_BINARY_IMAGES}" in
+	usb*)
+		case "${LH_BINARY_FILESYSTEM}" in
+			fat*)
+				CP_OPTIONS="-L"
+				;;
+		esac
+		;;
+esac
+
+# Copying common templates
+if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common ] && \
+Find_files "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common/*
+then
+	cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common/* binary
+fi
+
+if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common."${ARCH}" ] && \
+Find_files "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common."${ARCH}"/*
+then
+	cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/common."${ARCH}"/* binary
+fi
+
+# Copying live templates
+if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live ] && \
+Find_files "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live/*
+then
+	cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live/* binary
+fi
+
+if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live."${ARCH}" ] && \
+Find_files "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live."${ARCH}"/*
+then
+	cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/live."${ARCH}"/* binary
+fi
+
+if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
+then
+	# Copying install templates
+	if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install ] && \
+	Find_files "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install/*
+	then
+		cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install/* binary
+	fi
+
+	if [ -d "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}" ] && \
+	Find_files "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}"/*
+	then
+		cp -r ${CP_OPTIONS} "${LH_INCLUDES}"/"${LH_DISTRIBUTION}"/install."${ARCH}"/* binary
+	fi
+
+	# Adjusting install templates
+	ARCHITECTURE="$(echo ${LH_ARCHITECTURE} | sed -e 's| |/|g')"
+	DISTRIBUTION="$(echo ${LH_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
+	DISTRIBUTION="${DISTRIBUTION}$(echo ${LH_DISTRIBUTION} | cut -b 2-)"
+	eval VERSION="$`echo RELEASE_${LH_DISTRIBUTION}`"
+
+	if [ -d binary/pool/main/l/live-installer ]
+	then
+		TYPE="LIVE/INSTALL"
+	fi
+
+	TYPE="LIVE/NETINST"
+
+	DEBIAN_NAME="Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} ${TYPE} Binary $(date +%Y%m%d-%H:%M)"
+	DEBIAN_DATE="$(date +%Y%m%d-%H:%M)"
+
+	if [ "${LH_ARCHITECTURE}" = "i386" ]
+	then
+		DEBIAN_TOOLS_HTML=" <P>\n <tt>&nbsp;\n <A href="tools/">/tools/</a>\n </tt>\n\n and\n <tt>&nbsp;\n <A href="install/floppy/">/install/floppy/</a>\n </tt>"
+		DEBIAN_TOOLS_TXT="/tools/ and   /install/floppy/"
+	else
+		DEBIAN_TOOLS_HTML=" <P>\n <tt>&nbsp;\n <A href="tools/">/tools/</a>\n </tt>\n\n\n\n\n\n"
+		DEBIAN_TOOLS_TXT="/tools/"
+	fi
+
+	if [ -f binary/README.html ]
+	then
+		sed -i -e "s|DEBIAN_NAME|${DEBIAN_NAME}|g" -e "s|DEBIAN_DATE|${DEBIAN_DATE}|g" -e "s|DEBIAN_TOOLS|${DEBIAN_TOOLS_HTML}|g" binary/README.html
+		sed -i -e "s|DEBIAN_NAME|${DEBIAN_NAME}|g" -e "s|DEBIAN_DATE|${DEBIAN_DATE}|g" -e "s|DEBIAN_TOOLS|${DEBIAN_TOOLS_TXT}|g" binary/README.txt
+	fi
+fi
+
+# Creating stage file
+Create_stagefile .stage/binary_includes
diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso
new file mode 100755
index 0000000..56de7eb
--- /dev/null
+++ b/scripts/build/binary_iso
@@ -0,0 +1,228 @@
+#!/bin/sh
+
+# lh_binary_iso(1) - build iso binary image
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'build iso binary image')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+case "${LH_BINARY_IMAGES}" in
+	iso)
+		IMAGE="binary.iso"
+		;;
+
+	iso-hybrid)
+		IMAGE="binary-hybrid.iso"
+		;;
+
+	*)
+		exit 0
+		;;
+esac
+
+Echo_message "Begin building binary iso image..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_iso
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Checking depends
+Check_package chroot/usr/bin/genisoimage genisoimage
+
+if [ "${LH_BINARY_IMAGES}" = "iso-hybrid" ]
+then
+	Check_package chroot/usr/bin/isohybrid syslinux
+fi
+
+# Restoring cache
+Restore_cache cache/packages_binary
+
+# Installing depends
+Install_package
+
+# Remove old iso image
+if [ -f ${IMAGE} ]
+then
+	rm -f ${IMAGE}
+fi
+
+# Handle genisoimage generic options
+GENISOIMAGE_OPTIONS="-J -l -cache-inodes -allow-multidot"
+
+# Handle genisoimage live-helper specific options
+if [ "${_QUIET}" = "true" ]
+then
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet"
+fi
+
+if [ "${_VERBOSE}" = "true" ]
+then
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
+fi
+
+if [ -n "${LH_ISO_APPLICATION}" ] && [ "${LH_ISO_APPLICATION}" != "none" ]
+then
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LH_ISO_APPLICATION}\""
+fi
+
+if [ -n "${LH_ISO_PREPARER}" ] && [ "${LH_ISO_PREPARER}" != "none" ]
+then
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LH_ISO_PREPARER}\""
+fi
+
+if [ -n "${LH_ISO_PUBLISHER}" ] && [ "${LH_ISO_PUBLISHER}" != "none" ]
+then
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LH_ISO_PUBLISHER}\""
+fi
+
+if [ -n "${LH_ISO_VOLUME}" ] && [ "${LH_ISO_VOLUME}" != "none" ]
+then
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LH_ISO_VOLUME}\""
+fi
+
+# Handle genisoimage architecture specific options
+case "${LH_BOOTLOADER}" in
+	grub)
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/grub/stage2_eltorito"
+		GENISOIMAGE_EXCLUDE="boot/grub/stage2_eltorito"
+		;;
+
+	grub2)
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/grub/grub_eltorito -J"
+		GENISOIMAGE_EXCLUDE="boot/grub/grub_eltorito"
+		;;
+
+	silo)
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -G boot/isofs.b -B ..."
+		GENISOIMAGE_EXCLUDE="boot/isofs.b"
+		;;
+
+	syslinux)
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b isolinux/isolinux.bin -c isolinux/boot.cat"
+		GENISOIMAGE_EXCLUDE="isolinux/isolinux.bin"
+		;;
+
+	yaboot)
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r --iso-level 2 --netatalk -hfs -probe -map"
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} binary/yaboot/hfs.map --chrp-boot -part -no-desktop"
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -hfs-bless binary/yaboot -hfs-volid Debian/Live_powerpc"
+		GENISOIMAGE_EXCLUDE="yaboot/hfs.map"
+		;;
+
+	*)
+		Echo_warning "Bootloader on your architecture not yet supported by live-helper."
+		Echo_warning "This will produce a most likely not bootable image (Continuing in 5 seconds)."
+		sleep 5
+		;;
+esac
+
+if In_list "stripped minimal" "${LH_PACKAGES_LISTS}"
+then
+	if [ "${LH_DEBIAN_INSTALLER}" != "live" ]
+	then
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -m ${GENISOIMAGE_EXCLUDE}"
+	fi
+fi
+
+if [ "${LH_BOOTLOADER}" = "grub2" ]
+then
+
+cat > binary.sh << EOF
+#!/bin/sh
+
+input_dir=/usr/lib/grub/i386-pc
+
+# build core.img
+core_img=\$(mktemp)
+grub-mkimage -d \${input_dir} -o \${core_img} biosdisk iso9660
+
+# build grub_eltorito image
+cat \${input_dir}/cdboot.img \${core_img} > binary/boot/grub/grub_eltorito
+
+rm -f \${core_img}
+
+for file in \${input_dir}/*.mod \${input_dir}/efiemu??.o \
+	\${input_dir}/command.lst \${input_dir}/moddep.lst \${input_dir}/fs.lst \
+	\${input_dir}/handler.lst \${input_dir}/parttool.lst
+do
+	if test -f "\$file"
+	then
+		cp -f "\$file" binary/boot/grub
+	fi
+done
+EOF
+
+else
+	echo "#!/bin/sh" > binary.sh
+fi
+
+cat >> binary.sh << EOF
+
+genisoimage ${GENISOIMAGE_OPTIONS} -o ${IMAGE} binary
+EOF
+
+if [ "${LH_BINARY_IMAGES}" = "iso-hybrid" ]
+then
+
+cat >> binary.sh << EOF
+
+isohybrid ${ISOHYBRID_OPTIONS} ${IMAGE}
+EOF
+
+fi
+
+case "${LH_BUILD_WITH_CHROOT}" in
+	true)
+		# Moving image
+		mv binary.sh chroot
+		mv binary chroot
+
+		Chroot chroot "sh binary.sh"
+
+		# Move image
+		mv chroot/binary chroot/${IMAGE} ./
+		rm -f chroot/binary.sh
+		;;
+
+	false)
+		sh binary.sh
+		rm -f binary.sh
+		;;
+esac
+
+# Saving cache
+Save_cache cache/packages_binary
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_iso
diff --git a/scripts/build/binary_linux-image b/scripts/build/binary_linux-image
new file mode 100755
index 0000000..1915e8f
--- /dev/null
+++ b/scripts/build/binary_linux-image
@@ -0,0 +1,88 @@
+#!/bin/sh
+
+# lh_binary_linux-image(1) - install linux-image into binary
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'install linux-image into binary')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ]
+then
+	exit 0
+fi
+
+Echo_message "Begin install linux-image..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_linux-image
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+case "${LH_INITRAMFS}" in
+	casper)
+		DESTDIR="binary/casper"
+		;;
+
+	live-initramfs)
+		DESTDIR="binary/live"
+		;;
+
+	*)
+		DESTDIR="binary/boot"
+		;;
+esac
+
+case "${LH_ARCHITECTURE}" in
+	powerpc)
+		LINUX="vmlinux"
+		;;
+
+	*)
+		LINUX="vmlinuz"
+		;;
+esac
+
+Check_multiarchitecture
+
+# Creating directory
+mkdir -p "${DESTDIR}"
+
+# Installing linux-image
+cp chroot/boot/"${LINUX}"-* "${DESTDIR}"
+cp chroot/boot/initrd.img-* "${DESTDIR}"
+
+case "${LH_INITRAMFS}" in
+	live-initramfs)
+		if [ -e chroot/usr/share/doc/live-initramfs/parameters.txt ]
+		then
+			cp chroot/usr/share/doc/live-initramfs/parameters.txt "${DESTDIR}"/parameters.txt
+		fi
+		;;
+esac
+
+# Creating stage file
+Create_stagefile .stage/binary_linux-image
diff --git a/scripts/build/binary_local-hooks b/scripts/build/binary_local-hooks
new file mode 100755
index 0000000..070c36f
--- /dev/null
+++ b/scripts/build/binary_local-hooks
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+# lh_binary_local-hooks(1) - execute local hooks in binary
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'execute local hooks in binary')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin executing local hooks..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_local-hooks
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Processing local-hooks
+if Find_files config/binary_local-hooks/*
+then
+	for HOOK in config/binary_local-hooks/*
+	do
+		# Making hook executable
+		if [ ! -x "${HOOK}" ]
+		then
+			chmod +x "${HOOK}"
+		fi
+
+		# Executing hook
+		./"${HOOK}" || ( Echo_error "${HOOK} failed (exit non-zero). You should check for errors."; exit 1 )
+	done
+
+	# Creating stage file
+	Create_stagefile .stage/binary_local-hooks
+fi
diff --git a/scripts/build/binary_local-includes b/scripts/build/binary_local-includes
new file mode 100755
index 0000000..e23ae89
--- /dev/null
+++ b/scripts/build/binary_local-includes
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+# lh_binary_local-includes(1) - copy files into binary
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'copy files into binary')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin copying binary local includes..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_local-includes
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if Find_files config/binary_local-includes/
+then
+	# Copying includes
+	cd config/binary_local-includes
+	find . | cpio -dmpu --no-preserve-owner "${OLDPWD}"/binary
+	cd "${OLDPWD}"
+
+	# Removing symlinks
+	case "${LH_BINARY_IMAGES}" in
+		usb*)
+			find binary -type l | xargs rm -f
+			;;
+	esac
+
+	# Creating stage file
+	Create_stagefile .stage/binary_local-includes
+fi
diff --git a/scripts/build/binary_local-packageslists b/scripts/build/binary_local-packageslists
new file mode 100755
index 0000000..e7c8a50
--- /dev/null
+++ b/scripts/build/binary_local-packageslists
@@ -0,0 +1,128 @@
+#!/bin/sh
+
+# lh_binary_local-packageslists(1) - install local packages lists into binary
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'install local packages into binary')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin installing local packages lists..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_local-packageslists
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if Find_files config/binary_local-packageslists/*
+then
+	# Restoring cache
+	Restore_cache cache/packages_chroot
+
+	# Check depends
+	Check_package chroot/usr/bin/apt-ftparchive apt-utils
+
+	# Installing depends
+	Install_package
+
+	mkdir -p chroot/binary.deb/archives/partial
+	mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp
+	touch chroot/var/lib/dpkg/status
+
+	for PACKAGESLIST in config/binary_local-packageslists/*
+	do
+		# Generate package list
+		Expand_packagelist "${PACKAGESLIST}" "config/binary_local-packageslists" "config/chroot_local-packageslists" > chroot/root/"$(basename ${PACKAGESLIST})"
+
+		# Downloading additional packages
+		Chroot chroot "xargs --arg-file=/root/$(basename ${PACKAGESLIST}) apt-get ${APT_OPTIONS} -o Dir::Cache=/binary.deb --download-only install"
+
+		# Remove package list
+		rm chroot/root/"$(basename ${PACKAGESLIST})"
+	done
+
+	for FILE in chroot/binary.deb/archives/*.deb
+	do
+		SOURCE="$(dpkg -f ${FILE} Source | awk '{ print $1 }')"
+		SECTION="$(dpkg -f ${FILE} Section | awk '{ print $1 }')"
+
+		if [ -z "${SOURCE}" ]
+		then
+			SOURCE="$(basename ${FILE} | awk -F_ '{ print $1 }')"
+		fi
+
+		case "${SOURCE}" in
+			lib?*)
+				LETTER="$(echo ${SOURCE} | sed 's|\(....\).*|\1|')"
+				;;
+
+			*)
+				LETTER="$(echo ${SOURCE} | sed 's|\(.\).*|\1|')"
+				;;
+		esac
+
+		if echo "${SECTION}" | grep -qs contrib
+		then
+			SECTION="contrib"
+		elif echo "${SECTION}" | grep -qs non-free
+		then
+			SECTION="non-free"
+		else
+			SECTION="main"
+		fi
+
+		# Install directory
+		mkdir -p binary/pool/${SECTION}/"${LETTER}"/"${SOURCE}"
+
+		# Move files
+		mv "${FILE}" binary/pool/${SECTION}/"${LETTER}"/"${SOURCE}"
+	done
+
+	cd binary
+
+	for SECTION in pool/*
+	do
+		SECTION="$(basename ${SECTION})"
+
+		mkdir -p dists/${LH_DISTRIBUTION}/${SECTION}/binary-${LH_ARCHITECTURE}
+		apt-ftparchive packages pool/${SECTION} > dists/${LH_DISTRIBUTION}/${SECTION}/binary-${LH_ARCHITECTURE}/Packages
+		gzip -9 -c dists/${LH_DISTRIBUTION}/${SECTION}/binary-${LH_ARCHITECTURE}/Packages > dists/${LH_DISTRIBUTION}/${SECTION}/binary-${LH_ARCHITECTURE}/Packages.gz
+	done
+
+	cd "${OLDPWD}"
+
+	rm -rf chroot/binary.deb
+	mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
+
+	# Removing depends
+	Remove_package
+
+	# Saving cache
+	Save_cache cache/packages_chroot
+
+	# Creating stage file
+	Create_stagefile .stage/binary_local-packageslists
+fi
diff --git a/scripts/build/binary_manifest b/scripts/build/binary_manifest
new file mode 100755
index 0000000..d3e0f8a
--- /dev/null
+++ b/scripts/build/binary_manifest
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+# lh_binary_manifest(1) - create manifest
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'create manifest')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ]
+then
+	exit 0
+fi
+
+Echo_message "Begin creating manifest..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_manifest
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+case "${LH_INITRAMFS}" in
+	casper)
+		INITFS="casper"
+		SUFFIX="manifest"
+		;;
+
+	live-initramfs)
+		INITFS="live"
+		SUFFIX="packages"
+		;;
+esac
+
+# Add filesystem.packages
+Chroot chroot "dpkg-query -W" > binary/"${INITFS}"/filesystem.${SUFFIX}
+
+# Copy manifest as build output.
+cp binary/"${INITFS}"/filesystem.${SUFFIX} binary.${SUFFIX}
+
+# Creating stage file
+Create_stagefile .stage/binary_manifest
diff --git a/scripts/build/binary_memtest b/scripts/build/binary_memtest
new file mode 100755
index 0000000..c739c3a
--- /dev/null
+++ b/scripts/build/binary_memtest
@@ -0,0 +1,119 @@
+#!/bin/sh
+
+# lh_binary_memtest(1) - installs a memtest into binary
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'installs a memtest into binary')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ] || [ "${LH_MEMTEST}" = "false" ] || [ "${LH_MEMTEST}" = "none" ]
+then
+	exit 0
+fi
+
+Echo_message "Begin installing memtest..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_memtest
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LH_ARCHITECTURE}" != "amd64" ] && [ "${LH_ARCHITECTURE}" != "i386" ]
+then
+	Echo_warning "skipping binary_memtest, foreign architecture."
+	exit 0
+fi
+
+if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
+then
+
+	if [ -f chroot/usr/sbin/grub ] && [ ! -f chroot/boot/grub/menu.lst ]
+	then
+		GRUB="yes"
+
+		mkdir -p chroot/boot/grub
+		touch chroot/boot/grub/menu.lst
+	fi
+fi
+
+# Checking depends
+case "${LH_MEMTEST}" in
+	memtest86)
+		Check_package chroot/boot/memtest86.bin memtest86
+		;;
+
+	memtest86+)
+		Check_package chroot/boot/memtest86+.bin memtest86+
+		;;
+esac
+
+# Restoring cache
+Restore_cache cache/packages_binary
+
+# Installing depends
+Install_package
+
+# Setting destination directory
+case "${LH_INITRAMFS}" in
+	casper)
+		DESTDIR="binary/casper"
+		;;
+
+	live-initramfs)
+		DESTDIR="binary/live"
+		;;
+esac
+
+Check_multiarchitecture
+
+# Creating directory
+mkdir -p "${DESTDIR}"
+
+# Installing memtest
+case "${LH_BUILD_WITH_CHROOT}" in
+	true)
+		cp chroot/boot/${LH_MEMTEST}.bin "${DESTDIR}"/memtest
+		;;
+
+	false)
+		cp /boot/${LH_MEMTEST}.bin "${DESTDIR}"/memtest
+		;;
+esac
+
+# Saving cache
+Save_cache cache/packages_binary
+
+# Removing depends
+Remove_package
+
+if [ "${GRUB}" ]
+then
+	rm -rf chroot/boot/grub
+fi
+
+# Creating stage file
+Create_stagefile .stage/binary_memtest
diff --git a/scripts/build/binary_net b/scripts/build/binary_net
new file mode 100755
index 0000000..5646455
--- /dev/null
+++ b/scripts/build/binary_net
@@ -0,0 +1,167 @@
+#!/bin/sh
+
+# lh_binary_net(1) - build netboot binary image
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'build netboot binary image')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if ! In_list net "${LH_BINARY_IMAGES}"
+then
+	exit 0
+fi
+
+if [ "${LH_NET_TARBALL}" = "none" ]
+then
+	exit 0
+fi
+
+Echo_message "Begin building binary netboot image..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_net
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LH_ARCHITECTURE}" = "sparc" ]
+then
+	# Checking depends
+	Check_package chroot/usr/bin/elftoaout sparc-utils
+
+	# Restoring cache
+	Restore_cache cache/packages_binary
+
+	# Installing depends
+	Install_package
+
+	# Set target and source directories
+	DESTDIR="tftpboot"
+	case "${LH_INITRAMFS}" in
+		casper)
+			ORIGDIR="binary/casper"
+			;;
+
+		live-initramfs)
+			ORIGDIR="binary/live"
+			;;
+	esac
+
+	# Find defaults
+	DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
+	DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
+	DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')"
+	DEFAULT_MAP="$(echo chroot/boot/System.map-*${DEFAULT_FLAVOUR})"
+
+	gzip -cd ${ORIGDIR}/${DEFAULT_KERNEL} > kernel.tmp
+
+	mkdir -p ${DESTDIR}
+	rm -f ${DESTDIR}/boot.img
+	elftoaout -o ${DESTDIR}/boot.img kernel.tmp
+
+	case "${DEFAULT_FLAVOUR}" in
+		sparc32)
+			piggyback ${DESTDIR}/boot.img ${DEFAULT_MAP} ${ORIGDIR}/${DEFAULT_INITRD}
+			;;
+		sparc64)
+			piggyback64 ${DESTDIR}/boot.img ${DEFAULT_MAP} ${ORIGDIR}/${DEFAULT_INITRD}
+			;;
+		*)
+			Echo_error "Invalid default kernel flavour for sparc \"%s\"" "${DEFAULT_FLAVOUR}"
+			exit 1;
+			;;
+	esac
+
+	# Pad boot.img
+	REMAINDER=$((( 4 - $(stat -c %s ${DESTDIR}/boot.img) % 4 ) % 4))
+	dd if=/dev/zero bs=1 count=${REMAINDER} >> ${DESTDIR}/boot.img
+
+	# No need for kernel and initrd images in the binary
+	rm -f ${ORIGDIR}/vmlinuz-*
+	rm -f ${ORIGDIR}/initrd.img-*
+
+	# Clean temporaries
+	rm -f kernel.tmp
+
+	# Saving cache
+	Save_cache cache/packages_binary
+
+	# Removing depends
+	Remove_package
+fi
+
+# Remove old binary
+rm -f binary-net.tar.bz2
+rm -f binary-net.tar.gz
+rm -f binary-net.tar
+
+# Creating image file
+ROOT_DIR=$(basename ${LH_NET_ROOT_PATH})
+if [ "${ROOT_DIR}" = "chroot" ]
+then
+	mv chroot chroot.tmp
+fi
+
+if [ "${ROOT_DIR}" != "binary" ]
+then
+	mv binary ${ROOT_DIR}
+fi
+
+mkdir binary.tmp
+mv ${ROOT_DIR} tftpboot binary.tmp
+cd binary.tmp
+
+case "${LH_NET_TARBALL}" in
+	bzip2)
+		tar cfj ../binary-net-tar.bz2 *
+		;;
+
+	gzip)
+		tar cf ../binary-net.tar *
+		gzip ${GZIP_OPTIONS} ../binary-net.tar
+		;;
+
+	tar)
+		tar cf ../binary-net.tar *
+		;;
+esac
+
+mv * ../
+cd "${OLDPWD}"
+rmdir binary.tmp
+
+if [ "${ROOT_DIR}" != "binary" ]
+then
+	mv ${ROOT_DIR} binary
+fi
+
+if [ "${ROOT_DIR}" = "chroot" ]
+then
+	mv chroot.tmp chroot
+fi
+
+# Creating stage file
+Create_stagefile .stage/binary_net
diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs
new file mode 100755
index 0000000..58284fd
--- /dev/null
+++ b/scripts/build/binary_rootfs
@@ -0,0 +1,437 @@
+#!/bin/sh
+
+# lh_binary_rootfs(1) - build rootfs image
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'build rootfs image')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin building root filesystem image..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap .stage/binary_chroot
+
+# Checking stage file
+Check_stagefile .stage/binary_rootfs
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+case "${LH_ARCHITECTURE}" in
+	amd64|i386)
+		LINUX="vmlinuz"
+		;;
+
+	powerpc)
+		LINUX="vmlinux"
+		;;
+esac
+
+case "${LH_INITRAMFS}" in
+	casper)
+		INITFS="casper"
+		;;
+
+	live-initramfs)
+		INITFS="live"
+		;;
+esac
+
+# Creating directory
+mkdir -p binary/${INITFS}
+
+for STAGE in ${LH_CACHE_STAGES}
+do
+	if [ "${STAGE}" = "rootfs" ] && [ -d cache/stages_rootfs ]
+	then
+		# Removing old chroot
+		rm -rf binary/"${INITFS}"/filesystem.*
+
+		# Restoring old cache
+		mkdir -p binary/"${INITFS}"
+		${LH_ROOT_COMMAND} cp -a cache/stages_rootfs/filesystem.* binary/"${INITFS}"
+
+		if [ -n "${LH_ROOT_COMMAND}" ]
+		then
+			${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) binary
+		fi
+
+		# Creating stage file
+		Create_stagefile .stage/binary_rootfs
+		exit 0
+	fi
+done
+
+case "${LH_CHROOT_FILESYSTEM}" in
+	ext2|ext3)
+		# Checking depends
+		Check_package chroot/usr/bin/genext2fs genext2fs
+
+		# Restoring cache
+		Restore_cache cache/packages_binary
+
+		# Installing depends
+		Install_package
+
+		# Remove old image
+		if [ -f binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM} ]
+		then
+			rm -f binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}
+		fi
+
+		DU_DIM="$(du -ks chroot/chroot | cut -f1)"
+		REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LH_CHROOT_FILESYSTEM})"
+
+		RESERVED_PERCENTAGE="--reserved-percentage"
+
+		case "${LH_BUILD_WITH_CHROOT}" in
+			true)
+				Chroot chroot "genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot filesystem.${LH_CHROOT_FILESYSTEM}"
+
+				# Move image
+				mv chroot/filesystem.${LH_CHROOT_FILESYSTEM} binary/${INITFS}
+
+				case "${LH_MODE}" in
+					ubuntu)
+						du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
+						;;
+				esac
+
+				if [ -e chroot/chroot.cache ]
+				then
+					rm -f .lock
+					mv chroot/chroot chroot.tmp
+
+					lh chroot_linux-image remove ${*}
+					lh chroot_sources remove ${*}
+					lh chroot_apt remove ${*}
+					lh chroot_hostname remove ${*}
+					lh chroot_resolv remove ${*}
+					lh chroot_hosts remove ${*}
+					lh chroot_sysv-rc remove ${*}
+					lh chroot_upstart remove ${*}
+					lh chroot_dpkg remove ${*}
+					lh chroot_debianchroot remove ${*}
+					lh chroot_sysfs remove ${*}
+					lh chroot_selinuxfs remove ${*}
+					lh chroot_proc remove ${*}
+					lh chroot_devpts remove ${*}
+
+					rm -rf chroot
+					mv chroot.tmp chroot
+
+					lh chroot_devpts install ${*}
+					lh chroot_proc install ${*}
+					lh chroot_selinuxfs install ${*}
+					lh chroot_sysfs install ${*}
+					lh chroot_debianchroot install ${*}
+					lh chroot_dpkg install ${*}
+					lh chroot_sysv-rc install ${*}
+					lh chroot_upstart install ${*}
+					lh chroot_hosts install ${*}
+					lh chroot_resolv install ${*}
+					lh chroot_hostname install ${*}
+					lh chroot_apt install ${*}
+					lh chroot_sources install ${*}
+					lh chroot_linux-image install ${*}
+
+					touch .lock
+				else
+					rm -rf chroot/chroot
+
+					# Removing depends
+					Remove_package
+				fi
+				;;
+
+			false)
+				genext2fs --size-in-blocks=${REAL_DIM} ${RESERVED_PERCENTAGE}=0 --root=chroot binary/${INITFS}/filesystem.${LH_CHROOT_FILESYSTEM}
+				;;
+		esac
+
+		# Saving cache
+		Save_cache cache/packages_binary
+		;;
+
+	jffs2)
+		# Checking depends
+		Check_package chroot/usr/sbin/mkfs.jffs2 mtd-tools
+
+		# Restoring cache
+		Restore_cache cache/packages_binary
+
+		# Installing depends
+		Install_package
+
+		# Remove old jffs2 image
+		if [ -f binary/${INITFS}/filesystem.jffs2 ]
+		then
+			rm -f binary/${INITFS}/filesystem.jffs2
+		fi
+
+		if [ -n "${LH_JFFS2_ERASEBLOCK}" ]
+		then
+			JFFS2_OPTIONS="--eraseblock=${LH_JFFS2_ERASEBLOCK}"
+		fi
+
+		case "${LH_BUILD_WITH_CHROOT}" in
+			true)
+				Chroot chroot "mkfs.jffs2 ${JFFS2_OPTIONS} --root=chroot --output filesystem.jffs2"
+
+				# Move image
+				mv chroot/filesystem.jffs2 binary/${INITFS}
+
+				if [ -e chroot/chroot.cache ]
+				then
+					rm -f .lock
+					mv chroot/chroot chroot.tmp
+
+					lh chroot_linux-image remove ${*}
+					lh chroot_sources remove ${*}
+					lh chroot_apt remove ${*}
+					lh chroot_hostname remove ${*}
+					lh chroot_resolv remove ${*}
+					lh chroot_hosts remove ${*}
+					lh chroot_sysv-rc remove ${*}
+					lh chroot_upstart remove ${*}
+					lh chroot_dpkg remove ${*}
+					lh chroot_debianchroot remove ${*}
+					lh chroot_sysfs remove ${*}
+					lh chroot_selinuxfs remove ${*}
+					lh chroot_proc remove ${*}
+					lh chroot_devpts remove ${*}
+
+					rm -rf chroot
+					mv chroot.tmp chroot
+
+					lh chroot_devpts install ${*}
+					lh chroot_proc install ${*}
+					lh chroot_selinuxfs install ${*}
+					lh chroot_sysfs install ${*}
+					lh chroot_debianchroot install ${*}
+					lh chroot_dpkg install ${*}
+					lh chroot_sysv-rc install ${*}
+					lh chroot_upstart install ${*}
+					lh chroot_hosts install ${*}
+					lh chroot_resolv install ${*}
+					lh chroot_hostname install ${*}
+					lh chroot_apt install ${*}
+					lh chroot_sources install ${*}
+					lh chroot_linux-image install ${*}
+
+					touch .lock
+				else
+					rm -rf chroot/chroot
+
+					# Removing depends
+					Remove_package
+				fi
+				;;
+
+			false)
+				mkfs.jffs2 ${JFFS2_OPTIONS} --root=chroot --output binary/${INITFS}/filesystem.jffs2
+				;;
+		esac
+
+		# Saving cache
+		Save_cache cache/packages_binary
+		;;
+
+	plain)
+		if [ -d binary/${INITFS}/filesystem.dir ]
+		then
+			rm -rf binary/${INITFS}/filesystem.dir
+		fi
+
+		case "${LH_BUILD_WITH_CHROOT}" in
+			true)
+				mv chroot/chroot binary/${INITFS}/filesystem.dir
+				;;
+
+			false)
+				cp -a chroot binary/${INITFS}/filesystem.dir
+				;;
+		esac
+		;;
+
+	squashfs)
+		# Checking depends
+		Check_package chroot/usr/share/doc/squashfs-tools squashfs-tools
+
+		# Restoring cache
+		Restore_cache cache/packages_binary
+
+		# Installing depends
+		Install_package
+
+		Echo_message "Preparing squashfs image..."
+		Echo_message "This may take a while."
+
+		# Remove old squashfs image
+		if [ -f binary/${INITFS}/filesystem.squashfs ]
+		then
+			rm -f binary/${INITFS}/filesystem.squashfs
+		fi
+
+		# Remove stale squashfs image
+		rm -f chroot/filesystem.squashfs
+
+		MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -no-progress"
+
+		if [ "${_VERBOSE}" = "true" ]
+		then
+			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -info"
+		fi
+
+		if [ -f config/binary_rootfs/squashfs.sort ]
+		then
+			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -sort squashfs.sort"
+			cp config/binary_rootfs/squashfs.sort chroot #FIXME
+		fi
+
+		case "${LH_BUILD_WITH_CHROOT}" in
+			true)
+				# Create image
+				Chroot chroot "mksquashfs chroot filesystem.squashfs ${MKSQUASHFS_OPTIONS}"
+
+				case "${LH_MODE}" in
+					ubuntu)
+						du -B 1 -s chroot/chroot | cut -f1 > binary/${INITFS}/filesystem.size
+						;;
+				esac
+
+				# Move image
+				${LH_ROOT_COMMAND} mv chroot/filesystem.squashfs binary/${INITFS}
+				${LH_ROOT_COMMAND} rm -f chroot/squashfs.sort
+
+				if [ -e chroot/chroot.cache ]
+				then
+					rm -f .lock
+					mv chroot/chroot chroot.tmp
+
+					lh chroot_linux-image remove ${*}
+					lh chroot_sources remove ${*}
+					lh chroot_apt remove ${*}
+					lh chroot_hostname remove ${*}
+					lh chroot_resolv remove ${*}
+					lh chroot_hosts remove ${*}
+					lh chroot_sysv-rc remove ${*}
+					lh chroot_upstart remove ${*}
+					lh chroot_dpkg remove ${*}
+					lh chroot_debianchroot remove ${*}
+					lh chroot_sysfs remove ${*}
+					lh chroot_selinuxfs remove ${*}
+					lh chroot_proc remove ${*}
+					lh chroot_devpts remove ${*}
+
+					rm -rf chroot
+					mv chroot.tmp chroot
+
+					lh chroot_devpts install ${*}
+					lh chroot_proc install ${*}
+					lh chroot_selinuxfs install ${*}
+					lh chroot_sysfs install ${*}
+					lh chroot_debianchroot install ${*}
+					lh chroot_dpkg install ${*}
+					lh chroot_sysv-rc install ${*}
+					lh chroot_upstart install ${*}
+					lh chroot_hosts install ${*}
+					lh chroot_resolv install ${*}
+					lh chroot_hostname install ${*}
+					lh chroot_apt install ${*}
+					lh chroot_sources install ${*}
+					lh chroot_linux-image install ${*}
+
+					touch .lock
+				else
+					rm -rf chroot/chroot
+
+					# Removing depends
+					Remove_package
+				fi
+
+				${LH_ROOT_COMMAND} chmod 0644 binary/${INITFS}/filesystem.squashfs
+				;;
+
+			false)
+				mksquashfs chroot binary/${INITFS}/filesystem.squashfs ${MKSQUASHFS_OPTIONS}
+
+				case "${LH_MODE}" in
+					ubuntu)
+						du -B 1 -s chroot | cut -f1 > binary/${INITFS}/filesystem.size
+						;;
+				esac
+				;;
+		esac
+
+		if [ -n "${LH_ROOT_COMMAND}" ]
+		then
+			${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) binary/${INITFS}
+		fi
+
+		# Saving cache
+		Save_cache cache/packages_binary
+		;;
+
+	none)
+		if [ -d binary ]
+		then
+			rm -rf binary
+		fi
+
+		case "${LH_BUILD_WITH_CHROOT}" in
+			true)
+				mv chroot/chroot binary
+				;;
+
+			false)
+				Echo_message "This may take a while."
+				cp -a chroot binary
+				;;
+		esac
+		;;
+
+esac
+
+for STAGE in ${LH_CACHE_STAGES}
+do
+	if [ "${STAGE}" = "rootfs" ]
+	then
+		rm -rf cache/stages_rootfs
+
+		mkdir -p cache/stages_rootfs
+
+		if [ "${LH_CHROOT_FILESYSTEM}" != "none" ]
+		then
+			${LH_ROOT_COMMAND} cp -a binary/"${INITFS}"/filesystem.* cache/stages_rootfs
+		fi
+
+		if [ -n "${LH_ROOT_COMMAND}" ]
+		then
+			${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) cache/stages_rootfs
+		fi
+	fi
+done
+
+# Creating stage file
+Create_stagefile .stage/binary_rootfs
diff --git a/scripts/build/binary_silo b/scripts/build/binary_silo
new file mode 100755
index 0000000..e527c7f
--- /dev/null
+++ b/scripts/build/binary_silo
@@ -0,0 +1,272 @@
+#!/bin/sh
+
+# lh_binary_silo(1) - installs silo into binary
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'installs silo into binary')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_BOOTLOADER}" != "silo" ]
+then
+	exit 0
+fi
+
+# Check image type
+case "${LH_BINARY_IMAGES}" in
+	iso*|usb*|tar)
+		;;
+
+	net)
+		# silo not required for sparc netbooting
+		exit 0
+		;;
+esac
+
+Echo_message "Begin installing silo..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_silo
+
+# Checking silo templates
+Check_templates silo
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Check architecture
+Check_architecture sparc
+
+# Checking depends
+Check_package chroot/usr/sbin/silo silo
+
+# Restoring cache
+Restore_cache cache/packages_binary
+
+# Installing depends
+Install_package
+
+# Local functions
+Silo_live_entry ()
+{
+	LABEL="${1}"
+	KERNEL="${2}"
+	INITRD="${3}"
+	APPEND="${4}"
+
+	DIRECTORY="/$(basename ${DESTDIR_LIVE})"
+
+	LINUX_LIVE="${LINUX_LIVE}\nimage=${DIRECTORY}/${KERNEL}\n"
+	LINUX_LIVE="${LINUX_LIVE}\t  label=${LABEL}\n"
+	LINUX_LIVE="${LINUX_LIVE}\t  initrd=${DIRECTORY}/${INITRD}\n"
+	LINUX_LIVE="${LINUX_LIVE}\t  append=\"boot=${INITFS} live-config LH_BOOTAPPEND_LIVE ${APPEND}\"\n"
+}
+
+Silo_install_entry ()
+{
+	LABEL="${1}"
+	KERNEL="${2}"
+	INITRD="${3}"
+	APPEND="${4}"
+
+	DIRECTORY="/$(basename ${DESTDIR_INSTALL})"
+
+	if [ "${LABEL}" != "rescue" ] && [ "${LABEL}" != "rescuegui" ]
+	then
+		APPEND="${APPEND} quiet"
+	fi
+
+	LINUX_INSTALL="${LINUX_INSTALL}\nimage=${DIRECTORY}/${KERNEL}\n"
+	LINUX_INSTALL="${LINUX_INSTALL}\t  label=${LABEL}\n"
+	LINUX_INSTALL="${LINUX_INSTALL}\t  initrd=${DIRECTORY}/${INITRD}\n"
+	LINUX_INSTALL="${LINUX_INSTALL}\t  append=\"LH_BOOTAPPEND_LIVE ${APPEND} LH_BOOTAPPEND_INSTALL\"\n"
+}
+
+# Setting destination directories
+DESTDIR_INSTALL="binary/install"
+case "${LH_INITRAMFS}" in
+	casper)
+		INITFS="casper"
+		DESTDIR_LIVE="binary/casper"
+		;;
+
+	live-initramfs)
+		INITFS="live"
+		DESTDIR_LIVE="binary/live"
+		;;
+esac
+
+# Creating directory
+mkdir -p "${DESTDIR_LIVE}"
+
+# Setting boot parameters
+case "${LH_ENCRYPTION}" in
+	""|false)
+		;;
+	*)
+		LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
+		;;
+esac
+
+if [ -n "${LH_USERNAME}" ]
+then
+	case "${LH_INITRAMFS}" in
+		casper)
+			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
+			;;
+
+		live-initramfs)
+			if [ "${LH_USERNAME}" != "user" ]
+			then
+				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
+			fi
+			;;
+	esac
+fi
+
+if [ -n "${LH_HOSTNAME}" ]
+then
+	case "${LH_INITRAMFS}" in
+		casper)
+			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
+			;;
+
+		live-initramfs)
+			if [ "${LH_HOSTNAME}" != "debian" ]
+			then
+				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
+			fi
+			;;
+	esac
+fi
+
+if [ "${LH_UNION_FILESYSTEM}" != "aufs" ]
+then
+	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}"
+fi
+
+if [ -n "${LH_NET_COW_PATH}" ]
+then
+	Echo_error "Net cow not supported on silo"
+	exit 1
+fi
+
+if [ "${LH_EXPOSED_ROOT}" != "false" ]
+then
+	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot"
+fi
+
+LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's|  ||')"
+
+# Parameters are listed at: linux/Documentation/kernel-parameters.txt
+FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=ofonly"
+
+# Assembling kernel configuration
+
+# Default entries
+DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
+DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
+DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')"
+
+Silo_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
+Silo_live_entry "live-failsafe" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${FAILSAFE}"
+
+if [ "$(echo ${LH_LINUX_FLAVOURS} | wc -w)" -gt "1" ]
+then
+	for KERNEL in chroot/boot/vmlinuz-*
+	do
+		KERNEL_IMAGE="$(basename ${KERNEL})"
+		KERNEL_VERSION="$(echo ${KERNEL_IMAGE} | sed -e 's|vmlinuz-||')"
+		INITRD="initrd.img-${KERNEL_VERSION}"
+
+		Silo_live_entry "live-${KERNEL_VERSION}" "${KERNEL_IMAGE}" "${INITRD}"
+		Silo_live_entry "live-${KERNEL_VERSION}-failsafe" "${KERNEL_IMAGE}" "${INITRD}" "${FAILSAFE}"
+	done
+fi
+
+LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')"
+
+# Assembling debian-installer configuration
+if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
+then
+	VMLINUZ_DI="vmlinuz"
+	INITRD_DI="initrd.gz"
+	APPEND_DI="vga=normal"
+
+	Silo_install_entry "linux" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
+	Silo_install_entry "install" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
+	Silo_install_entry "expert" "${VMLINUZ_DI}" "${INITRD_DI}" "priority=low ${APPEND_DI}"
+	Silo_install_entry "rescue" "${VMLINUZ_DI}" "${INITRD_DI}" "rescue/enable=true ${APPEND_DI}"
+	Silo_install_entry "auto" "${VMLINUZ_DI}" "${INITRD_DI}" "auto=true priority=critical ${APPEND_DI}"
+fi
+
+LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')"
+
+case "${LH_BINARY_IMAGES}" in
+	iso*|usb*)
+		# Copying silo
+		mkdir -p binary/boot
+
+		case "${LH_BUILD_WITH_CHROOT}" in
+			true)
+				cp chroot/boot/second.b binary/boot
+				;;
+
+			false)
+				cp /boot/second.b binary/boot
+				;;
+		esac
+
+		cp -r "${TEMPLATES}"/* binary/boot
+
+		if [ "${LH_DEBIAN_INSTALLER}" = "false" ]
+		then
+			rm -f binary/boot/debian.txt.install
+		else
+			mv binary/boot/debian.txt.install binary/boot/debian.txt
+		fi
+
+		# Configure silo templates
+		sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" \
+		       -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" \
+		       binary/boot/silo.conf
+		sed -i -e "s|LH_BOOTAPPEND_INSTALL|${LH_BOOTAPPEND_INSTALL}|" \
+		       -e "s|LH_BOOTAPPEND_LIVE|${LH_BOOTAPPEND_LIVE}|" \
+		       binary/boot/silo.conf
+		sed -i -e "s|LH_DATE|$(date +%Y%m%d)|" \
+		       -e "s|LH_VERSION|${VERSION}|" \
+		       -e "s|LH_DISTRIBUTION|${LH_DISTRIBUTION}|" \
+		       binary/boot/debian.txt
+		;;
+esac
+
+# Saving cache
+Save_cache cache/packages_binary
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_silo
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
new file mode 100755
index 0000000..43c0b54
--- /dev/null
+++ b/scripts/build/binary_syslinux
@@ -0,0 +1,659 @@
+#!/bin/sh
+
+# lh_binary_syslinux(1) - installs syslinux into binary
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'installs syslinux into binary')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_BOOTLOADER}" != "syslinux" ]
+then
+	exit 0
+fi
+
+Echo_message "Begin installing syslinux..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_syslinux
+
+# Checking syslinux templates
+Check_templates syslinux
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Check architecture
+Check_architecture amd64 i386
+Check_crossarchitecture
+
+# Checking depends
+Check_package chroot/usr/bin/syslinux syslinux
+
+# Restoring cache
+Restore_cache cache/packages_binary
+
+# Installing depends
+Install_package
+
+# Local functions
+Utf8_to_latin1 ()
+{
+	VALUE="${1}"
+
+	echo "${VALUE}" | iconv -f utf-8 -t latin1
+}
+
+Syslinux_memtest_entry ()
+{
+	LABEL="${1}"
+	MENULABEL="$(Utf8_to_latin1 "${2}")"
+	KERNEL="${3}"
+
+	MEMTEST="${MEMTEST}\nlabel ${LABEL}\n"
+
+	# Write the menu label if the syslinux menu is being use
+	MEMTEST="${MEMTEST}\tmenu label ${MENULABEL}\n"
+	MEMTEST="${MEMTEST}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n"
+	MEMTEST="$(/bin/echo ${MEMTEST} | sed -e 's|//|/|g')"
+}
+
+Syslinux_live_entry ()
+{
+	LABEL="${1}"
+	MENULABEL="$(Utf8_to_latin1 "${2}")"
+	MENULABEL="${2}"
+	KERNEL="${3}"
+	INITRD="${4}"
+	APPEND="${5}"
+
+	case "${LH_BINARY_IMAGES}" in
+		iso*|usb*)
+			NUMBER="$(ls -1 ${KERNEL_PATH} | grep 'vmlinuz[0-9]\+$' | wc -l)"
+			NUMBER="$((${NUMBER} +1))"
+
+			# Do not add numbering to filenames if first kernel/initrd
+			if [ "${NUMBER}" = "1" ]
+			then
+				NUMBER=""
+			fi
+
+			# Note: ISOLINUX will not find the kernel if the name ends in ".img".
+			if [ -e ${KERNEL_PATH}/${KERNEL} ]
+			then
+				mv ${KERNEL_PATH}/${KERNEL} ${KERNEL_PATH}/vmlinuz${NUMBER}
+			fi
+
+			if [ -e ${KERNEL_PATH}/${INITRD} ]
+			then
+				mv ${KERNEL_PATH}/${INITRD} ${KERNEL_PATH}/initrd${NUMBER}.img
+			fi
+
+			KERNEL=vmlinuz${NUMBER}
+			INITRD=initrd${NUMBER}.img
+		;;
+	esac
+
+	# Regular kernel
+	LINUX_LIVE="${LINUX_LIVE}\nlabel ${LABEL}\n"
+
+	# Write the menu label if the syslinux menu is being use
+	if [ -n "${MENULABEL}" ]
+	then
+		LINUX_LIVE="${LINUX_LIVE}\tmenu label ${MENULABEL}\n"
+	fi
+
+	LINUX_LIVE="${LINUX_LIVE}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n"
+	LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} live-config ${LH_BOOTAPPEND_LIVE} ${APPEND}\n"
+
+	# Failsafe kernel
+	LINUX_LIVE="${LINUX_LIVE}\nlabel ${LABEL}failsafe\n"
+
+	# Write the menu label if the syslinux menu is being use
+	if [ -n "${MENULABEL}" ]
+	then
+		LINUX_LIVE="${LINUX_LIVE}\tmenu label ${MENULABEL} (failsafe)\n"
+	fi
+
+	LINUX_LIVE="${LINUX_LIVE}\tkernel ${LIVE_KERNEL_PATH}/${KERNEL}\n"
+	LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${LIVE_KERNEL_PATH}/${INITRD} boot=${INITFS} live-config ${LH_BOOTAPPEND_LIVE} ${APPEND} ${FAILSAFE}\n"
+}
+
+Syslinux_install_entry ()
+{
+	LABEL="${1}"
+	KERNEL="${2}"
+	INITRD="${3}"
+	APPEND="${4}"
+
+	# Boot in quiet mode where appropriate
+	QAPPEND="quiet"
+
+	for TYPE in Install Expert Rescue Auto
+	do
+		case "${TYPE}" in
+			Install)
+				TAPPEND="${APPEND} ${QAPPEND}"
+				;;
+
+			Expert)
+				TAPPEND="priority=low ${APPEND}"
+				;;
+
+			Rescue)
+				TAPPEND="rescue/enable=true ${APPEND} ${QAPPEND}"
+				;;
+
+			Auto)
+				TAPPEND="auto=true priority=critical ${APPEND} ${QAPPEND}"
+				;;
+		esac
+
+		case "${LABEL}" in
+			Text)
+				TYPE_SUFFIX=""
+				;;
+			GUI)
+				TYPE_SUFFIX="gui"
+				;;
+		esac
+
+		LINUX_INSTALL="${LINUX_INSTALL}\nlabel $(echo "${TYPE}" | tr A-Z a-z)${TYPE_SUFFIX}\n"
+		LINUX_INSTALL="${LINUX_INSTALL}\tmenu label ${LABEL} ${TYPE}\n"
+		LINUX_INSTALL="${LINUX_INSTALL}\tkernel ${LIVE_INSTALL_KERNEL_PATH}/${KERNEL}\n"
+		LINUX_INSTALL="${LINUX_INSTALL}\tappend initrd=${LIVE_INSTALL_KERNEL_PATH}/${INITRD} ${TAPPEND} ${LH_BOOTAPPEND_INSTALL}\n"
+	done
+}
+
+Copy_syslinux_templates ()
+{
+	cp -r "${TEMPLATES}"/common/* ${SCREEN_PATH}
+
+	if [ "${LH_SYSLINUX_MENU}" = "false" ]
+	then
+		cp "${TEMPLATES}"/normal/* ${SCREEN_PATH}
+	else
+		cp "${TEMPLATES}"/menu/* ${SCREEN_PATH}
+
+		case "${LH_SYSLINUX_MENU}" in
+			gfxboot)
+				MENUMODULE="gfxboot.c32"
+				;;
+
+			menu)
+				MENUMODULE="menu.c32"
+				;;
+
+			vesamenu)
+				MENUMODULE="vesamenu.c32"
+				;;
+
+			*)
+				if [ -z "${LH_SYSLINUX_CFG}" ]
+				then
+					MENUMODULE=$(grep 'menu.c32' ${TEMPLATES}/menu/syslinux.cfg | sed 's|default\s*.*/\(.*menu.c32\)$|\1|g')
+				else
+					LH_SYSLINUX_CFG="${LH_SYSLINUX_CFG:-${TEMPLATES}/menu/syslinux.cfg}"
+				fi
+				;;
+		esac
+
+		case "${LH_BUILD_WITH_CHROOT}" in
+			true)
+				cp chroot/usr/lib/syslinux/"${MENUMODULE}" ${DATA_PATH}
+				;;
+			false)
+				cp /usr/lib/syslinux/"${MENUMODULE}" ${DATA_PATH}
+				;;
+		esac
+	fi
+
+	if ls "${TEMPLATES}/${LH_LANGUAGE}"/* > /dev/null 2>&1
+	then
+		cp -r "${TEMPLATES}"/"${LH_LANGUAGE}"/* ${SCREEN_PATH}
+	else
+		if ls "${TEMPLATES}"/en/* > /dev/null 2>&1
+		then
+			cp -r "${TEMPLATES}"/en/* ${SCREEN_PATH}
+		fi
+	fi
+
+	if ls ${SCREEN_PATH}/*.live > /dev/null 2>&1
+	then
+		for FILE in ${SCREEN_PATH}/*.live
+		do
+			mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .live)
+		done
+	fi
+
+	if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
+	then
+		if ls ${SCREEN_PATH}/*.install > /dev/null 2>&1
+		then
+			for FILE in ${SCREEN_PATH}/*.install
+			do
+				mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .install)
+			done
+		fi
+
+		case "${LH_ARCHITECTURE}" in
+			amd64|i386|powerpc)
+				if ls ${SCREEN_PATH}/*.install.g-i > /dev/null 2>&1
+				then
+					for FILE in ${SCREEN_PATH}/*.install.g-i
+					do
+						mv ${FILE} $(dirname ${FILE})/$(basename ${FILE} .install.g-i)
+					done
+				fi
+				;;
+
+			*)
+				rm -f ${SCREEN_PATH}/*.install.g-i
+				;;
+		esac
+	else
+		rm -f ${SCREEN_PATH}/*.install*
+	fi
+
+	if [ "${LH_SYSLINUX_MENU}" != "false" ]
+	then
+		rm -f ${DATA_PATH}/boot.txt
+	fi
+
+	# Copying custom splash screen
+	if [ "${LH_SYSLINUX_SPLASH}" = "none" ]
+	then
+		# no splash screen
+		SPLASH=""
+		rm -f ${SCREEN_PATH}/splash.rle
+		rm -f ${DATA_PATH}/splash.png
+	else
+		if [ "${LH_SYSLINUX_MENU}" = "false" ]
+		then
+			SPLASH="${LIVE_DATA_PATH}/splash.rle"
+		else
+			SPLASH="${LIVE_DATA_PATH}/splash.png"
+		fi
+
+		if [ -n "${LH_SYSLINUX_SPLASH}" ]
+		then
+			if [ ! -e "${LH_SYSLINUX_SPLASH}" ]
+			then
+				Echo_error "%s doen't exist" "${LH_SYSLINUX_SPLASH}"
+				exit 1
+			else
+				rm -f ${SCREEN_PATH}/splash.rle
+				rm -f ${DATA_PATH}/splash.png
+				cp -f "${LH_SYSLINUX_SPLASH}" ${DATA_PATH}/$(basename ${SPLASH})
+			fi
+		fi
+	fi
+}
+
+Configure_syslinux_templates ()
+{
+	templates="$(find ${SYSLINUX_PATH} -type f -name '*.cfg' -o -name '*.txt')"
+
+	for template_file in ${templates}
+	do
+		sed -i -e "s|{\$LINUX_LIVE}|${LINUX_LIVE}|" \
+		       -e "s|{\$LINUX_INSTALL}|${LINUX_INSTALL}|" \
+		       -e "s|{\$MEMTEST}|${MEMTEST}|" \
+		       -e "s|{\$LIVE_SCREEN_PATH}|${LIVE_SCREEN_PATH}|" \
+		       -e "s|{\$LIVE_DATA_PATH}|${LIVE_DATA_PATH}|" \
+		       -e "s|{\$LIVE_KERNEL_PATH}|${LIVE_KERNEL_PATH}|" \
+		       -e "s|{\$SPLASH}|${SPLASH}|" \
+		       -e "s|{\$LH_DISTRIBUTION}|${LH_DISTRIBUTION}|" \
+		       -e "s|{\$LH_DATE}|$(date +%Y%m%d)|" \
+		       -e "s|{\$LH_MEDIA}|${MEDIA}|" \
+		       -e "s|{\$LH_VERSION}|${VERSION}|" \
+		       -e "s|{\$LH_SYSLINUX_TIMEOUT}|${LH_SYSLINUX_TIMEOUT}0|" \
+		$template_file
+	done
+
+	case "${LH_BINARY_IMAGES}" in
+		usb*)
+			if [ -f "${SYSLINUX_PATH}/exithelp.cfg" ]
+			then
+				sed -i -e "s|config isolinux.cfg|config syslinux.cfg|" "${SYSLINUX_PATH}"/exithelp.cfg
+			fi
+			;;
+
+		net)
+			if [ -f "${SCREEN_PATH}/exithelp.cfg" ]
+			then
+				sed -i -e "s|config isolinux.cfg|config ${LIVE_KERNEL_PATH}/pxelinux.cfg/default|" "${SCREEN_PATH}"/exithelp.cfg
+			fi
+			;;
+	esac
+}
+
+# Setting up common variables
+case "${LH_INITRAMFS}" in
+	casper)
+		INITFS="casper"
+		;;
+
+	live-initramfs)
+		INITFS="live"
+		;;
+esac
+
+# Setting boot method specific variables
+case "${LH_BINARY_IMAGES}" in
+	iso*)
+		SYSLINUX_PATH="binary/isolinux"
+		KERNEL_PATH="binary/${INITFS}"
+		SCREEN_PATH="${SYSLINUX_PATH}"
+		DATA_PATH="${SCREEN_PATH}"
+		LIVE_KERNEL_PATH="/${INITFS}"
+		LIVE_INSTALL_KERNEL_PATH="/install"
+		LIVE_SCREEN_PATH="/isolinux"
+		LIVE_DATA_PATH="${LIVE_SCREEN_PATH}"
+		MEDIA="CD-ROM"
+		;;
+
+	net)
+		SYSLINUX_PATH="tftpboot"
+		KERNEL_PATH="${SYSLINUX_PATH}/debian-live/${LH_ARCHITECTURE}"
+		SCREEN_PATH="${SYSLINUX_PATH}/debian-live/${LH_ARCHITECTURE}/boot-screens"
+		DATA_PATH="${SCREEN_PATH}"
+		LIVE_KERNEL_PATH="debian-live/${LH_ARCHITECTURE}"
+		LIVE_INSTALL_KERNEL_PATH="debian-install/${LH_ARCHITECTURE}"
+		LIVE_SCREEN_PATH="debian-live/${LH_ARCHITECTURE}/boot-screens"
+		LIVE_DATA_PATH="${LIVE_SCREEN_PATH}"
+		MEDIA="netboot"
+		;;
+
+	usb*|tar)
+		SYSLINUX_PATH="binary/syslinux"
+		KERNEL_PATH="binary/${INITFS}"
+		SCREEN_PATH="${SYSLINUX_PATH}"
+		DATA_PATH="${SCREEN_PATH}"
+		LIVE_KERNEL_PATH="/${INITFS}"
+		LIVE_INSTALL_KERNEL_PATH="/install"
+		LIVE_SCREEN_PATH="/syslinux"
+		LIVE_DATA_PATH="${LIVE_SCREEN_PATH}"
+		MEDIA="hd-media"
+		;;
+esac
+
+Check_multiarchitecture
+
+# Creating directories
+mkdir -p "${KERNEL_PATH}"
+mkdir -p "${SCREEN_PATH}"
+mkdir -p "${DATA_PATH}"
+
+# Setting boot parameters
+case "${LH_ENCRYPTION}" in
+	""|false)
+		;;
+	*)
+		LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
+		;;
+esac
+
+if [ -n "${LH_USERNAME}" ]
+then
+	case "${LH_INITRAMFS}" in
+		casper)
+			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
+			;;
+
+		live-initramfs)
+			if [ "${LH_USERNAME}" != "user" ]
+			then
+				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
+			fi
+			;;
+	esac
+fi
+
+if [ -n "${LH_HOSTNAME}" ]
+then
+	case "${LH_INITRAMFS}" in
+		casper)
+			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
+			;;
+
+		live-initramfs)
+			if [ "${LH_HOSTNAME}" != "debian" ]
+			then
+				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
+			fi
+			;;
+	esac
+fi
+
+if [ "${LH_UNION_FILESYSTEM}" != "aufs" ]
+then
+	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}"
+fi
+
+if [ "${LH_EXPOSED_ROOT}" != "false" ]
+then
+	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot"
+fi
+
+if [ "${LH_BINARY_IMAGES}" = "net" ]
+then
+	case "${LH_NET_ROOT_FILESYSTEM}" in
+		nfs)
+			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} netboot=nfs nfsroot=${LH_NET_ROOT_SERVER}:${LH_NET_ROOT_PATH}"
+			;;
+
+		cifs)
+			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} netboot=cifs nfsroot=//${LH_NET_ROOT_SERVER}${LH_NET_ROOT_PATH}"
+			;;
+
+		*)
+			Echo_error "Unsupported net filesystem"
+			exit 1
+			;;
+	esac
+
+	if [ -n "${LH_NET_ROOT_MOUNTOPTIONS}" ]
+	then
+		LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} nfsopts=${LH_NET_ROOT_MOUNTOPTIONS}"
+	fi
+fi
+
+if [ -n "${LH_NET_COW_PATH}" ]
+then
+	case "${LH_NET_COW_FILESYSTEM}" in
+		nfs)
+			if [ -n "${LH_NET_COW_MOUNTOPTIONS}" ]
+			then
+				LH_NET_COW_MOUNTOPTIONS=",${LH_NET_COW_MOUNTOPTIONS}"
+			fi
+
+			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} nfscow=${LH_NET_COW_SERVER}:${LH_NET_COW_PATH}${LH_NET_COW_MOUNTOPTIONS}"
+			;;
+
+		*)
+			Echo_error "Unsupported net filesystem"
+			exit 1
+			;;
+	esac
+fi
+
+LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's|  ||')"
+
+# Parameters are listed at: linux/Documentation/kernel-parameters.txt
+FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=normal"
+
+# Moving kernels into place
+if [ "binary/${INITFS}" != "${KERNEL_PATH}" ]
+then
+	mv binary/${INITFS}/vmlinuz* ${KERNEL_PATH}
+	mv binary/${INITFS}/initrd* ${KERNEL_PATH}
+
+	if [ "${LH_MEMTEST}" != "false" ] && [ "${LH_MEMTEST}" != "none" ]
+	then
+		mv binary/${INITFS}/memtest ${KERNEL_PATH}
+	fi
+fi
+
+# Default entries
+DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
+DEFAULT_KERNEL="$(basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR})"
+DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinuz-||')"
+
+Syslinux_live_entry "live" "${LH_SYSLINUX_MENU_LIVE_ENTRY}" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
+
+if [ "$(echo ${LH_LINUX_FLAVOURS} | wc -w)" -gt "1" ]
+then
+	for FLAVOUR in ${LH_LINUX_FLAVOURS}
+	do
+		if [ "${FLAVOUR}" != "${DEFAULT_FLAVOUR}" ]
+		then
+			FLAVOUR_KERNEL="$(basename chroot/boot/vmlinuz-*${FLAVOUR})"
+			FLAVOUR_INITRD="initrd.img-$(echo ${FLAVOUR_KERNEL} | sed -e 's|vmlinuz-||')"
+			Syslinux_live_entry "live-${FLAVOUR}" "${LH_SYSLINUX_MENU_LIVE_ENTRY} ${FLAVOUR}" "${FLAVOUR_KERNEL}" "${FLAVOUR_INITRD}"
+		fi
+	done
+fi
+
+# Only needed for non-vesamenu, non-gfxboot syslinux
+case "${LH_SYSLINUX_MENU}" in
+	false|menu)
+		# Adding syslinux hardcoded default label entry
+		Syslinux_live_entry "linux" "" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
+		;;
+esac
+
+# Assembling debian-installer configuration
+if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
+then
+	VMLINUZ_DI="vmlinuz"
+	INITRD_DI="initrd.gz"
+	APPEND_DI="vga=normal"
+
+	VMLINUZ_GI="gtk/vmlinuz"
+	INITRD_GI="gtk/initrd.gz"
+	APPEND_GI="video=vesa:ywrap,mtrr vga=788"
+
+	if [ -f "binary/${LIVE_INSTALL_KERNEL_PATH}/${VMLINUZ_DI}" ] && [ -f "binary/${LIVE_INSTALL_KERNEL_PATH}/${INITRD_DI}" ]
+	then
+		Syslinux_install_entry "Text" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
+	fi
+
+	if [ -f "binary/${LIVE_INSTALL_KERNEL_PATH}/${VMLINUZ_GI}" ] && [ -f "binary/${LIVE_INSTALL_KERNEL_PATH}/${INITRD_GI}" ]
+	then
+		Syslinux_install_entry "GUI" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}"
+	fi
+fi
+
+# Assembling memtest configuration
+if [ -f "${KERNEL_PATH}"/memtest ]
+then
+	Syslinux_memtest_entry "memtest" "${LH_SYSLINUX_MENU_MEMTEST_ENTRY}" "memtest"
+fi
+
+# Copy templates to base syslinux directory
+Copy_syslinux_templates
+
+# Fill in templates with created values
+Configure_syslinux_templates
+
+# Configure syslinux setup per boot method
+case "${LH_BINARY_IMAGES}" in
+	iso*)
+		case "${LH_BUILD_WITH_CHROOT}" in
+			true)
+				cp chroot/usr/lib/syslinux/isolinux.bin ${SCREEN_PATH}
+				;;
+			false)
+				cp /usr/lib/syslinux/isolinux.bin ${SCREEN_PATH}
+				;;
+		esac
+
+		mv ${SCREEN_PATH}/syslinux.cfg ${SCREEN_PATH}/isolinux.cfg
+
+		# Copying configuration file
+		if [ -n "${LH_SYSLINUX_CFG}" ]
+		then
+			cp "${LH_SYSLINUX_CFG}" ${SCREEN_PATH}/isolinux.cfg
+		fi
+		;;
+
+	net)
+		case "${LH_BUILD_WITH_CHROOT}" in
+			true)
+				cp chroot/usr/lib/syslinux/pxelinux.0 ${KERNEL_PATH}
+				;;
+			false)
+				cp /usr/lib/syslinux/pxelinux.0 ${KERNEL_PATH}
+				;;
+		esac
+
+		mkdir -p ${KERNEL_PATH}/pxelinux.cfg
+		ln -s ${LIVE_KERNEL_PATH}/pxelinux.cfg ${SYSLINUX_PATH}/pxelinux.cfg
+		ln -s ${LIVE_KERNEL_PATH}/pxelinux.0 ${SYSLINUX_PATH}/pxelinux.0
+
+		# Adjusting include pathes
+		for FILE in ${SCREEN_PATH}/*.cfg
+		do
+			sed -i -e "s|^include |include ${LIVE_SCREEN_PATH}/|g" "${FILE}"
+		done
+
+		sed -i -e "s| f| ${LIVE_SCREEN_PATH}/f|g" ${SCREEN_PATH}/prompt.cfg
+
+		mv ${SCREEN_PATH}/syslinux.cfg ${KERNEL_PATH}/pxelinux.cfg/default
+
+		# Copying configuration file
+		if [ -n "${LH_SYSLINUX_CFG}" ]
+		then
+			cp "${LH_SYSLINUX_CFG}" ${KERNEL_PATH}/pxelinux.cfg/default
+		fi
+		;;
+
+	usb*|tar)
+		case "${LH_BUILD_WITH_CHROOT}" in
+			true)
+				cp chroot/usr/lib/syslinux/isolinux.bin ${SCREEN_PATH}/syslinux.bin
+				;;
+			false)
+				cp /usr/lib/syslinux/isolinux.bin ${SCREEN_PATH}/syslinux.bin
+				;;
+		esac
+
+		# Copying configuration file
+		if [ -n "${LH_SYSLINUX_CFG}" ]
+		then
+			cp "${LH_SYSLINUX_CFG}" ${SCREEN_PATH}/syslinux.cfg
+		fi
+		;;
+esac
+
+# Saving cache
+Save_cache cache/packages_binary
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_syslinux
diff --git a/scripts/build/binary_tar b/scripts/build/binary_tar
new file mode 100755
index 0000000..df3f306
--- /dev/null
+++ b/scripts/build/binary_tar
@@ -0,0 +1,52 @@
+#!/bin/sh
+
+# lh_binary_tar(1) - build harddisk binary image
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'build harddisk binary image')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if ! In_list tar "${LH_BINARY_IMAGES}"
+then
+	exit 0
+fi
+
+Echo_message "Begin building binary harddisk image..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_tar
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old binary
+rm -f binary.tar.gz
+
+tar cf binary-tar.tar binary
+gzip ${GZIP_OPTIONS} binary-tar.tar
+
+# Creating stage file
+Create_stagefile .stage/binary_tar
diff --git a/scripts/build/binary_usb b/scripts/build/binary_usb
new file mode 100755
index 0000000..13aa76c
--- /dev/null
+++ b/scripts/build/binary_usb
@@ -0,0 +1,280 @@
+#!/bin/sh
+
+# lh_binary_usb(1) - build binary usb image
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'build binary image')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if ! In_list usb-hdd "${LH_BINARY_IMAGES}"
+then
+	exit 0
+fi
+
+Echo_message "Begin building binary usb image..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap .stage/chroot_proc
+
+# Checking stage file
+Check_stagefile .stage/binary_usb
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Checking depends
+Check_package chroot/sbin/mkdosfs dosfstools
+Check_package chroot/usr/share/doc/mtools mtools
+Check_package chroot/sbin/parted parted
+
+if [ "${LH_ARCHITECTURE}" = "sparc" ]
+then
+	case "${LH_BINARY_FILESYSTEM}" in
+		ext2|ext3)
+			Check_package chroot/sbin/mkfs.ext2 e2fsprogs
+			;;
+
+		*)
+			Echo_error "Sparc only supports booting from ext2, ext3 (or ufs)"
+			exit 1
+			;;
+	esac
+fi
+
+case "${LH_BOOTLOADER}" in
+	grub)
+		Check_package chroot/usr/sbin/grub grub
+		;;
+
+	syslinux)
+		Check_package chroot/usr/bin/syslinux syslinux
+		;;
+esac
+
+# Restoring cache
+Restore_cache cache/packages_binary
+
+# Installing depends
+Install_package
+
+# Remove old binary
+if [ -f binary.img ]
+then
+	rm -f binary.img
+fi
+
+# Enforce fat32 if we find individual files bigger than 2GB
+if [ "${LH_BINARY_FILESYSTEM}" = "fat16" ] && [ -n "$(find binary -size +1999M)" ]
+then
+	Echo_warning "FAT16 doesn't support files larger than 2GB, automatically enforcing FAT32."
+
+	LH_BINARY_FILESYSTEM="fat32"
+	export LH_BINARY_FILESYSTEM
+fi
+
+# Enforce fat32 if we have images in total bigger than 2GB
+if [ "${LH_BINARY_FILESYSTEM}" = "fat16" ] && [ "$(du -s binary | awk '{ print $1 }')" -gt "1900000" ]
+then
+	Echo_warning "FAT16 doesn't support partitions larger than 2GB, automatically enforcing FAT32"
+
+	LH_BINARY_FILESYSTEM="fat32"
+	export LH_BINARY_FILESYSTEM
+fi
+
+# Everything which comes here needs to be cleaned up,
+DU_DIM="$(du -ms binary | cut -f1)"
+REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LH_BINARY_FILESYSTEM})"
+dd if=/dev/zero of=chroot/binary.img bs=1024k count=0 seek=${REAL_DIM}
+FREELO="$(${LH_LOSETUP} -f)"
+if [ ! -b chroot/${FREELO} ]
+then
+	MAKEDEV="true"
+
+	mv chroot/dev chroot/dev.tmp
+	find /dev | cpio -dmpu chroot
+fi
+
+echo "!!! The following error/warning messages can be ignored !!!"
+Losetup $FREELO chroot/binary.img 0
+
+case "${LH_ARCHITECTURE}" in
+	sparc)
+		PARTITION_TABLE_TYPE="sun"
+		;;
+	*)
+		PARTITION_TABLE_TYPE="msdos"
+		;;
+esac
+
+case "${LH_BINARY_FILESYSTEM}" in
+	ext2|ext3)
+		PARTITION_TYPE="ext2"
+		;;
+
+	fat16|fat32)
+		PARTITION_TYPE="${LH_BINARY_FILESYSTEM}"
+		;;
+
+	*)
+		Echo_error "Unsupported binary filesystem %s" "${LH_BINARY_FILESYSTEM}"
+		exit 1
+		;;
+esac
+
+case "${LH_BUILD_WITH_CHROOT}" in
+	true)
+		Chroot chroot "parted -s ${FREELO} mklabel ${PARTITION_TABLE_TYPE}" || true
+		Chroot chroot "parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100%" || true
+		Chroot chroot "parted -s ${FREELO} set 1 boot on" || true
+		Chroot chroot "parted -s ${FREELO} set 1 lba off" || true
+
+		if [ "${LH_BOOTLOADER}" = "syslinux" ]
+		then
+			dd if=chroot/usr/lib/syslinux/mbr.bin of=${FREELO} bs=440 count=1
+		fi
+		;;
+
+	false)
+		parted -s ${FREELO} mklabel ${PARTITION_TABLE_TYPE} || true
+		parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100% || true
+		parted -s ${FREELO} set 1 boot on || true
+		parted -s ${FREELO} set 1 lba off || true
+
+		if [ "${LH_BOOTLOADER}" = "syslinux" ]
+		then
+			dd if=/usr/lib/syslinux/mbr.bin of=${FREELO} bs=440 count=1
+		fi
+		;;
+esac
+
+sleep 1
+${LH_LOSETUP} -d ${FREELO}
+
+FREELO="$(${LH_LOSETUP} -f)"
+Losetup $FREELO chroot/binary.img 1
+
+case "${LH_BINARY_FILESYSTEM}" in
+	ext2|ext3)
+		MKFS="${LH_BINARY_FILESYSTEM}"
+		MKFS_OPTIONS="-L DEBIAN_LIVE -m 0"
+		;;
+
+	fat16)
+		MKFS="vfat"
+		MKFS_OPTIONS="-F 16 -n DEBIAN_LIVE"
+		;;
+
+	fat32)
+		MKFS="vfat"
+		MKFS_OPTIONS="-F 32 -n DEBIAN_LIVE"
+		;;
+esac
+
+case "${LH_BUILD_WITH_CHROOT}" in
+	true)
+		Chroot chroot "mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO}"
+		;;
+
+	false)
+		mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO}
+		;;
+esac
+
+case "${LH_BINARY_FILESYSTEM}" in
+	fat*)
+		CP_OPTIONS="-L"
+		;;
+esac
+
+mkdir -p chroot/binary.tmp
+${LH_ROOT_COMMAND} mount ${FREELO} chroot/binary.tmp
+cp -r -T ${CP_OPTIONS} binary/ chroot/binary.tmp
+
+FIXME()
+{
+if [ "${LH_BOOTLOADER}" = "grub" ]
+then
+
+cat > chroot/grub.sh << EOF
+cd binary.tmp
+grub --batch << EOM
+find /live/vmlinuz
+EOM
+EOF
+
+	rootpartition="$(Chroot chroot 'sh grub.sh' 2>/dev/null | grep -A 1 'find /live/vmlinuz' | grep -v 'find /live/vmlinuz')"
+	usbdev="$(echo $rootpartition | sed -e 's|,[[:digit:]]||')"
+	echo "Root partition is $rootpartition, device is: $usbdev"
+
+	echo "WAITING..." && read WAIT
+
+#cat > chroot/grub.sh << EOF
+#grub --batch << EOM
+#root $rootpartition
+#setup $usbdev
+#EOM
+#EOF
+
+#Chroot chroot "sh grub.sh"
+
+	rm -f chroot/grub.sh
+fi
+}
+
+${LH_ROOT_COMMAND} umount chroot/binary.tmp
+rmdir chroot/binary.tmp
+
+if [ "${LH_BOOTLOADER}" = "syslinux" ]
+then
+	case "${LH_BUILD_WITH_CHROOT}" in
+		true)
+			Chroot chroot "syslinux ${FREELO}"
+			;;
+
+		false)
+			syslinux ${FREELO}
+			;;
+	esac
+fi
+
+sleep 1
+${LH_LOSETUP} -d ${FREELO}
+
+echo "!!! The above error/warning messages can be ignored !!!"
+
+if [ -n "${MAKEDEV}" ]
+then
+	rm -rf chroot/dev
+	mv chroot/dev.tmp chroot/dev
+fi
+
+mv chroot/binary.img ./
+
+# Saving cache
+Save_cache cache/packages_binary
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_usb
diff --git a/scripts/build/binary_virtual-hdd b/scripts/build/binary_virtual-hdd
new file mode 100755
index 0000000..ac864b9
--- /dev/null
+++ b/scripts/build/binary_virtual-hdd
@@ -0,0 +1,118 @@
+#!/bin/sh
+
+# lh_binary_virtual-hdd(1) - build binary virtual-hdd image
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'build binary image')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if ! In_list virtual-hdd "${LH_BINARY_IMAGES}"
+then
+	exit 0
+fi
+
+Echo_message "Begin building binary virtual-hdd image..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap .stage/chroot_proc
+
+# Checking stage file
+Check_stagefile .stage/binary_virtual-hdd
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
+then
+	case "${LH_BINARY_FILESYSTEM}" in
+		ext2|ext3)
+			Check_package chroot/sbin/mkfs.ext2 e2fsprogs
+			;;
+	esac
+fi
+
+# Restoring cache
+Restore_cache cache/packages_binary
+
+# Installing depends
+Install_package
+
+# Remove old binary
+if [ -f binary-virtual.img ]
+then
+	rm -f binary-virtual.img
+fi
+
+Echo_message "Creating virtual disk image..."
+dd if=/dev/zero of=binary-virtual.img bs=1024k count=0 seek=${LH_VIRTUAL_ROOT_SIZE}
+
+if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
+then
+	mv binary-virtual.img chroot
+
+	# hack to recreate mtab from chroot_hacks if its gone for some reason
+	if ! Chroot chroot "test -s /etc/mtab"
+	then
+		Chroot chroot "rm -f /etc/mtab"
+		Chroot chroot "ln -s /proc/mounts /etc/mtab"
+	fi
+
+	case "${LH_BINARY_FILESYSTEM}" in
+		ext2)
+			Chroot chroot "mkfs.ext2 -F binary-virtual.img"
+			;;
+
+		ext3)
+			Chroot chroot "mkfs.ext3 -F binary-virtual.img"
+			;;
+	esac
+
+	mv chroot/binary-virtual.img ./
+else
+	case "${LH_BINARY_FILESYSTEM}" in
+		ext2)
+			mkfs.ext2 -F binary-virtual.img
+			;;
+
+		ext3)
+			mkfs.ext3 -F binary-virtual.img
+			;;
+	esac
+fi
+
+mkdir -p binary.tmp
+${LH_ROOT_COMMAND} mount -o loop binary-virtual.img binary.tmp
+cp -a binary/* binary.tmp
+cp -af binary/.disk* binary.tmp
+
+${LH_ROOT_COMMAND} umount binary.tmp
+rmdir binary.tmp
+
+# Saving cache
+Save_cache cache/packages_binary
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_virtual-hdd
diff --git a/scripts/build/binary_win32-loader b/scripts/build/binary_win32-loader
new file mode 100755
index 0000000..1edbc1a
--- /dev/null
+++ b/scripts/build/binary_win32-loader
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+# lh_binary_win32-loader(1) - copy win32-loader into binary
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'copy win32-loader into binary')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_WIN32_LOADER}" != "true" ] || [ "${LH_BINARY_IMAGES}" = "virtual-hdd" ]
+then
+	exit 0
+fi
+
+Echo_message "Begin copying win32-loader..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_win32-loader
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+case "${LH_ARCHITECTURE}" in
+	amd64|i386)
+		case "${LH_DISTRIBUTION}" in
+			lenny|squeeze)
+				WIN32_LOADER="/usr/lib/win32-loader"
+				;;
+
+			*)
+				WIN32_LOADER="/usr/share/win32"
+				;;
+		esac
+
+		if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
+		then
+			# Checking depends
+			Check_package chroot/${WIN32_LOADER}/win32-loader.exe win32-loader
+
+			# Restoring cache
+			Restore_cache cache/packages_binary
+
+			# Installing depends
+			Install_package
+
+			# Copying win32-loader
+			cp -r chroot/${WIN32_LOADER}/* binary
+		else
+			cp -r ${WIN32_LOADER}/* binary
+		fi
+
+		mv binary/win32-loader.exe binary/setup.exe
+
+		if [ -e binary/win32-loader-standalone.exe ]
+		then
+			mv binary/win32-loader-standalone.exe binary/setup-standalone.exe
+		fi
+
+		if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
+		then
+
+cat > binary/win32-loader.ini << EOF
+[installer]
+arch=${LH_ARCHITECTURE}
+i386/linux=install/vmlinuz
+i386/initrd=install/initrd.gz
+i386/gtk/linux=install/vmlinuz
+i386/gtk/initrd=install/gtk/initrd.gz
+
+[grub]
+g2ldr=g2ldr
+g2ldr.mbr=g2ldr.mbr
+EOF
+
+		fi
+
+		# Saving cache
+		Save_cache cache/packages_binary
+
+		# Removing depends
+		Remove_package
+		;;
+
+	*)
+		Echo_warning "win32-loader inclusion is set to true but not compatible with your architecture, ignoring."
+		;;
+esac
+
+# Creating stage file
+Create_stagefile .stage/binary_win32-loader
diff --git a/scripts/build/binary_yaboot b/scripts/build/binary_yaboot
new file mode 100755
index 0000000..cf84e2c
--- /dev/null
+++ b/scripts/build/binary_yaboot
@@ -0,0 +1,314 @@
+#!/bin/sh
+
+# lh_binary_yaboot(1) - installs yaboot into binary
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'installs yaboot into binary')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_BOOTLOADER}" != "yaboot" ]
+then
+	exit 0
+fi
+
+Echo_message "Begin installing yaboot..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_yaboot
+
+# Checking yaboot templates
+Check_templates yaboot
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Check architecture
+Check_architecture powerpc ppc64
+Check_crossarchitecture
+
+# Checking depends
+Check_package chroot/usr/lib/yaboot/yaboot yaboot
+
+# Restoring cache
+Restore_cache cache/packages_binary
+
+# Installing depends
+Install_package
+
+# Local functions
+Yaboot_live_entry ()
+{
+	LABEL="${1}"
+	KERNEL="${2}"
+	INITRD="${3}"
+	APPEND="${4}"
+
+	DIRECTORY="/$(basename ${DESTDIR_LIVE})"
+
+	LINUX_LIVE="${LINUX_LIVE}\nimage=${DIRECTORY}/${KERNEL}\n"
+	LINUX_LIVE="${LINUX_LIVE}\tlabel=${LABEL}\n"
+	LINUX_LIVE="${LINUX_LIVE}\tinitrd=${DIRECTORY}/${INITRD}\n"
+	LINUX_LIVE="${LINUX_LIVE}\tappend=\"boot=${INITFS} live-config LH_BOOTAPPEND_LIVE ${APPEND}\"\n"
+	LINUX_LIVE="${LINUX_LIVE}\tinitrd-size=10240\n"
+}
+
+Yaboot_install_entry ()
+{
+	LABEL="${1}"
+	KERNEL="${2}"
+	INITRD="${3}"
+	APPEND="${4}"
+
+	DIRECTORY="/$(basename ${DESTDIR_INSTALL})"
+
+	QAPPEND="quiet"
+
+	for TYPE in Install Expert Rescue Auto
+	do
+		case "${TYPE}" in
+			Install)
+				TAPPEND="${APPEND} ${QAPPEND}"
+				;;
+
+			Expert)
+				TAPPEND="priority=low ${APPEND}"
+				;;
+
+			Rescue)
+				TAPPEND="rescue/enable=true ${APPEND} ${QAPPEND}"
+				;;
+
+			Auto)
+				TAPPEND="auto=true priority=critical ${APPEND} ${QAPPEND}"
+				;;
+		esac
+
+		case "${LABEL}" in
+			Text)
+				TYPE_SUFFIX=""
+				;;
+			GUI)
+				TYPE_SUFFIX="gui"
+				;;
+		esac
+
+		LINUX_INSTALL="${LINUX_INSTALL}\nimage=${DIRECTORY}/${KERNEL}\n"
+		LINUX_INSTALL="${LINUX_INSTALL}\tlabel=${TYPE}${TYPE_SUFFIX}\n"
+		LINUX_INSTALL="${LINUX_INSTALL}\tinitrd=${DIRECTORY}/${INITRD}\n"
+		LINUX_INSTALL="${LINUX_INSTALL}\tappend=\"${TAPPEND} ${LH_BOOTAPPEND_INSTALL}\"\n"
+		LINUX_INSTALL="${LINUX_INSTALL}\tinitrd-size=10240\n"
+	done
+}
+
+case "${LH_INITRAMFS}" in
+	casper)
+		INITFS="casper"
+		;;
+
+	live-initramfs)
+		INITFS="live"
+		;;
+esac
+
+# Setting destination directory
+case "${LH_BINARY_IMAGES}" in
+	iso*)
+		case "${LH_INITRAMFS}" in
+			casper)
+				DESTDIR_LIVE="binary/casper"
+				;;
+
+			live-initramfs)
+				DESTDIR_LIVE="binary/live"
+				;;
+		esac
+
+		DESTDIR_INSTALL="binary/install"
+		;;
+
+	usb*|net|tar)
+		Echo_error "not yet supported, aborting (FIXME)."
+		exit 1
+	;;
+esac
+
+Check_multiarchitecture
+
+# Creating directory
+mkdir -p "${DESTDIR_LIVE}"
+
+# Setting boot parameters
+case "${LH_ENCRYPTION}" in
+	""|false)
+		;;
+	*)
+		LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} encryption=${LH_ENCRYPTION}"
+		;;
+esac
+
+if [ -n "${LH_USERNAME}" ]
+then
+	case "${LH_INITRAMFS}" in
+		casper)
+			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
+			;;
+
+		live-initramfs)
+			if [ "${LH_USERNAME}" != "user" ]
+			then
+				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} username=${LH_USERNAME}"
+			fi
+			;;
+	esac
+fi
+
+if [ -n "${LH_HOSTNAME}" ]
+then
+	case "${LH_INITRAMFS}" in
+		casper)
+			LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
+			;;
+
+		live-initramfs)
+			if [ "${LH_HOSTNAME}" != "debian" ]
+			then
+				LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} hostname=${LH_HOSTNAME}"
+			fi
+			;;
+	esac
+fi
+
+if [ "${LH_UNION_FILESYSTEM}" != "aufs" ]
+then
+	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} union=${LH_UNION_FILESYSTEM}"
+fi
+
+if [ -n "${LH_NET_COW_PATH}" ]
+then
+	Echo_error "Net cow not yet supported on yaboot"
+	exit 1
+fi
+
+if [ "${LH_EXPOSED_ROOT}" != "false" ]
+then
+	LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE} exposedroot"
+fi
+
+LH_BOOTAPPEND_LIVE="$(echo ${LH_BOOTAPPEND_LIVE} | sed -e 's|  ||')"
+
+# Parameters are listed at: linux/Documentation/kernel-parameters.txt
+FAILSAFE="noapic noapm nodma nomce nolapic nomodeset nosmp vga=ofonly"
+
+# Assembling kernel configuration
+
+# Default entries
+DEFAULT_FLAVOUR="$(echo ${LH_LINUX_FLAVOURS} | awk '{ print $1 }')"
+DEFAULT_KERNEL="$(basename chroot/boot/vmlinux-*${DEFAULT_FLAVOUR})"
+DEFAULT_INITRD="initrd.img-$(echo ${DEFAULT_KERNEL} | sed -e 's|vmlinux-||')"
+
+Yaboot_live_entry "live" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
+Yaboot_live_entry "live-failsafe" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${FAILSAFE}"
+
+if [ "$(echo ${LH_LINUX_FLAVOURS} | wc -w)" -gt "1" ]
+then
+	for KERNEL in chroot/boot/vmlinux-*
+	do
+		KERNEL_IMAGE="$(basename ${KERNEL})"
+		KERNEL_VERSION="$(echo ${KERNEL_IMAGE} | sed -e 's|vmlinux-||')"
+		INITRD="initrd.img-${KERNEL_VERSION}"
+
+		Yaboot_live_entry "live-${KERNEL_VERSION}" "${KERNEL_IMAGE}" "${INITRD}"
+		Yaboot_live_entry "live-${KERNEL_VERSION}-failsafe" "${KERNEL_IMAGE}" "${INITRD}" "${FAILSAFE}"
+	done
+fi
+
+LINUX_LIVE="$(/bin/echo ${LINUX_LIVE} | sed -e 's|binary||g' -e 's|//|/|g')"
+
+# Assembling debian-installer configuration
+if [ "${LH_DEBIAN_INSTALLER}" != "false" ]
+then
+	VMLINUZ_DI="vmlinuz"
+	INITRD_DI="initrd.gz"
+	APPEND_DI="vga=normal"
+
+	VMLINUZ_GI="gtk/vmlinuz"
+	INITRD_GI="gtk/initrd.gz"
+	APPEND_GI="video=vesa:ywrap,mtrr vga=788"
+
+	if [ -f "binary/${DESTDIR_INSTALL}/${VMLINUZ_DI}" ] && [ -f "binary/${DESTDIR_INSTALL}/${INITRD_DI}" ]
+	then
+		Yaboot_install_entry "Text" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
+	fi
+
+	if [ -f "binary/${DESTDIR_INSTALL}/${VMLINUZ_GI}" ] && [ -f "binary/${DESTDIR_INSTALL}/${INITRD_GI}" ]
+	then
+		Yaboot_install_entry "GUI" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}"
+	fi
+fi
+
+LINUX_INSTALL="$(/bin/echo ${LINUX_INSTALL} | sed -e 's|binary||g' -e 's|//|/|g')"
+
+case "${LH_BINARY_IMAGES}" in
+	iso*|usb*)
+		# Copying yaboot
+		mkdir -p binary/yaboot
+
+		case "${LH_BUILD_WITH_CHROOT}" in
+			true)
+				cp chroot/usr/lib/yaboot/yaboot binary/yaboot
+				;;
+
+			false)
+				cp /usr/lib/yaboot/yaboot binary/yaboot
+				;;
+		esac
+
+		cp -r "${TEMPLATES}"/* binary/yaboot
+
+		case "${LH_BINARY_IMAGES}" in
+			usb*)
+				mv binary/yaboot/yaboot.conf binary/yaboot/yaboot.conf.tmp
+				echo "root=/dev/ram" > binary/yaboot/yaboot.conf
+				cat binary/yaboot/yaboot.conf.tmp >> binary/yaboot/yaboot.conf
+				rm -f binary/yaboot/yaboot.conf.tmp
+				;;
+		esac
+
+		# Configure yaboot templates
+		sed -i -e "s|LINUX_LIVE|${LINUX_LIVE}|" -e "s|LINUX_INSTALL|${LINUX_INSTALL}|" binary/yaboot/yaboot.conf
+		sed -i -e "s|LH_BOOTAPPEND_INSTALL|${LH_BOOTAPPEND_INSTALL}|" -e "s|LH_BOOTAPPEND_LIVE|${LH_BOOTAPPEND_LIVE}|" binary/yaboot/yaboot.conf
+		sed -i -e "s|LH_DATE|$(date +%Y%m%d)|" -e "s|LH_VERSION|${VERSION}|" binary/yaboot/boot.msg
+		;;
+esac
+
+# Saving cache
+Save_cache cache/packages_binary
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/binary_yaboot
diff --git a/scripts/build/bootstrap b/scripts/build/bootstrap
new file mode 100755
index 0000000..4c4c3b7
--- /dev/null
+++ b/scripts/build/bootstrap
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+# lh_bootstrap(1) - bootstrap a Debian system
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'bootstrap a Debian system')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Setup cleanup function
+Setup_cleanup
+
+# Bootstrapping system
+lh bootstrap_cache restore ${*}
+lh bootstrap_copy ${*}
+lh bootstrap_cdebootstrap ${*}
+lh bootstrap_debootstrap ${*}
+lh bootstrap_cache save ${*}
diff --git a/scripts/build/bootstrap_cache b/scripts/build/bootstrap_cache
new file mode 100755
index 0000000..381276a
--- /dev/null
+++ b/scripts/build/bootstrap_cache
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+# lh_bootstrap_cache(1) - cach bootstrap stage
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'cache bootstrap stage')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Check architecture
+Check_crossarchitecture
+
+Echo_message "Begin caching bootstrap stage..."
+
+for STAGE in ${LH_CACHE_STAGES}
+do
+	if [ "${STAGE}" = "bootstrap" ]
+	then
+		case "${1}" in
+			restore)
+				# Checking stage file
+				Check_stagefile .stage/bootstrap_cache.restore
+
+				if [ -d cache/stages_bootstrap ]
+				then
+					# Checking lock file
+					Check_lockfile .lock
+
+					# Creating lock file
+					Create_lockfile .lock
+
+					# Removing old chroot
+					rm -rf chroot
+
+					# Restoring old cache
+					${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap chroot
+
+					if [ -n "${LH_ROOT_COMMAND}" ]
+					then
+						${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
+					fi
+
+					# Creating stage file
+					Create_stagefile .stage/bootstrap_cache.restore
+					Create_stagefile .stage/bootstrap
+
+					exit 0
+				fi
+				;;
+
+			save)
+				# Checking stage file
+				Check_stagefile .stage/bootstrap_cache.save
+
+				# Checking lock file
+				Check_lockfile .lock
+
+				# Creating lock file
+				Create_lockfile .lock
+
+				rm -rf cache/stages_bootstrap
+
+				mkdir -p cache
+
+				${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap
+
+				if [ -n "${LH_ROOT_COMMAND}" ]
+				then
+					${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) cache/stages_bootstrap
+				fi
+
+				# Creating stage file
+				Create_stagefile .stage/bootstrap_cache.save
+				;;
+		esac
+	fi
+done
diff --git a/scripts/build/bootstrap_cdebootstrap b/scripts/build/bootstrap_cdebootstrap
new file mode 100755
index 0000000..7925ebd
--- /dev/null
+++ b/scripts/build/bootstrap_cdebootstrap
@@ -0,0 +1,176 @@
+#!/bin/sh
+
+# lh_bootstrap_cdebootstrap(1) - bootstrap a Debian system with cdebootstrap(1)
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'bootstrap a Debian system with cdebootstrap(1)')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_BOOTSTRAP}" != "cdebootstrap" ] && [ "${LH_BOOTSTRAP}" != "cdebootstrap-static" ]
+then
+	exit 0
+fi
+
+# Check architecture
+Check_crossarchitecture
+
+Echo_message "Begin bootstrapping system..."
+
+Check_package /usr/bin/${LH_BOOTSTRAP} cdebootstrap
+
+# Ensure that a system is built as root
+lh testroot
+
+# Checking stage file
+Check_stagefile .stage/bootstrap
+Check_stagefile .stage/bootstrap_cache.restore
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Creating chroot directory
+mkdir -p chroot
+
+# Setting cdebootstrap options
+if [ -n "${LH_ARCHITECTURE}" ]
+then
+	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --arch=${LH_ARCHITECTURE}"
+fi
+
+if [ -n "${LH_BOOTSTRAP_CONFIG}" ]
+then
+	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --suite-config=${LH_BOOTSTRAP_CONFIG}"
+fi
+
+if [ -n "${LH_BOOTSTRAP_INCLUDE}" ]
+then
+	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --include=$(echo ${LH_BOOTSTRAP_INCLUDE} | sed 's|  *|,|g')"
+fi
+
+if [ -n "${LH_BOOTSTRAP_EXCLUDE}" ]
+then
+	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --exclude=$(echo ${LH_BOOTSTRAP_EXCLUDE} | sed 's|  *|,|g')"
+fi
+
+if [ -n "${LH_BOOTSTRAP_KEYRING}" ]
+then
+	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --keyring=${LH_BOOTSTRAP_KEYRING}"
+fi
+
+if [ -z "${LH_BOOTSTRAP_FLAVOUR}" ]
+then
+	case "${LH_PACKAGES_LISTS}" in
+		stripped|minimal)
+			CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
+			;;
+		*)
+			CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=standard"
+			;;
+	esac
+else
+	case "${LH_BOOTSTRAP_FLAVOUR}" in
+		stripped|minimal)
+			CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=minimal"
+			;;
+
+		*)
+			CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --flavour=${LH_BOOTSTRAP_FLAVOUR}"
+			;;
+	esac
+fi
+
+if [ "${_DEBUG}" = "true" ]
+then
+	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --debug"
+fi
+
+if [ "${_QUIET}" = "true" ]
+then
+	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --quiet"
+fi
+
+if [ "${_VERBOSE}" = "true" ]
+then
+	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --verbose"
+fi
+
+if [ "${LH_APT_SECURE}" = "false" ]
+then
+	CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --allow-unauthenticated"
+fi
+
+if [ -x "/usr/bin/cdebootstrap" ] || [ -x "/usr/bin/cdebootstrap-static" ]
+then
+	if [ "${LH_CACHE_PACKAGES}" = "true" ]
+	then
+		if ls cache/packages_bootstrap/*.deb > /dev/null 2>&1
+		then
+			mkdir -p chroot/var/cache/bootstrap
+			cp cache/packages_bootstrap/*.deb chroot/var/cache/bootstrap
+		fi
+
+		Echo_breakage "Running ${LH_BOOTSTRAP} (download-only)... "
+		${LH_ROOT_COMMAND} ${LH_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} --download-only "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}"
+
+		if [ -n "${LH_ROOT_COMMAND}" ]
+		then
+			${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
+		fi
+
+		# Removing old cache
+		rm -f cache/packages_bootstrap/*.deb
+
+		# Saving new cache
+		mkdir -p cache/packages_bootstrap
+		cp chroot/var/cache/bootstrap/*.deb cache/packages_bootstrap
+	fi
+
+	Echo_breakage "Running ${LH_BOOTSTRAP}... "
+	${LH_ROOT_COMMAND} ${LH_BOOTSTRAP} ${CDEBOOTSTRAP_OPTIONS} "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}"
+
+	if [ -n "${LH_ROOT_COMMAND}" ]
+	then
+		${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
+	fi
+
+	# Remove cdebootstrap-helper-diverts (needed at least for minimal flavours)
+	case "${LH_PACKAGES_LISTS}" in
+		stripped|minimal)
+			Chroot chroot "dpkg -P cdebootstrap-helper-diverts"
+			;;
+	esac
+
+	# Deconfiguring cdebootstrap configurations
+	rm -f chroot/etc/apt/sources.list
+	rm -f chroot/etc/hosts
+	rm -f chroot/etc/resolv.conf
+
+	# Removing bootstrap cache
+	rm -rf chroot/var/cache/bootstrap
+
+	# Creating stage file
+	Create_stagefile .stage/bootstrap
+else
+	Echo_error "Can't process file /usr/bin/${LH_BOOTSTRAP} (FIXME)"
+	exit 1
+fi
diff --git a/scripts/build/bootstrap_copy b/scripts/build/bootstrap_copy
new file mode 100755
index 0000000..d5e0cc5
--- /dev/null
+++ b/scripts/build/bootstrap_copy
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+# lh_bootstrap_copy(1) - bootstrap by copying the host system
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'bootstrap by copying the host system')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_BOOTSTRAP}" != "copy" ]
+then
+	exit 0
+fi
+
+# Check architecture
+Check_crossarchitecture
+
+Echo_message "Begin bootstrapping system..."
+
+# Ensure that a system is built as root
+lh testroot
+
+# Checking stage file
+Check_stagefile .stage/bootstrap
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Copying host system
+mkdir chroot
+cd chroot
+tar c / --exclude /proc --exclude /sys --exclude "$(dirname ${PWD})" | tar xv
+cd ..
+
+# Creating stage file
+Create_stagefile .stage/bootstrap
diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap
new file mode 100755
index 0000000..677817b
--- /dev/null
+++ b/scripts/build/bootstrap_debootstrap
@@ -0,0 +1,157 @@
+#!/bin/sh
+
+# lh_bootstrap_debootstrap(1) - bootstrap a Debian system with debootstrap(8)
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'bootstrap a Debian system with debootstrap(8)')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_BOOTSTRAP}" != "debootstrap" ]
+then
+	exit 0
+fi
+
+# Check architecture
+Check_crossarchitecture
+
+Echo_message "Begin bootstrapping system..."
+
+Check_package /usr/sbin/debootstrap debootstrap
+
+# Ensure that a system is built as root
+lh testroot
+
+# Checking stage file
+Check_stagefile .stage/bootstrap
+Check_stagefile .stage/bootstrap_cache.restore
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Creating chroot directory
+mkdir -p chroot
+
+# Setting debootstrap options
+if [ -n "${LH_ARCHITECTURE}" ]
+then
+	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --arch ${LH_ARCHITECTURE}"
+fi
+
+if [ "${LH_ARCHIVE_AREAS}" != "main" ]
+then
+	# Modify archive areas to remove leading/trailing whitespaces and replace other whitepspace with commas
+	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components $(echo ${LH_ARCHIVE_AREAS} | sed -e 's| |,|g')"
+fi
+
+if [ -n "${LH_BOOTSTRAP_CONFIG}" ]
+then
+	if [ -d "/usr/share/debootstrap/scripts/" ]
+	then
+		LH_DEBOOTSTRAP_SCRIPT="/usr/share/debootstrap/scripts/${LH_BOOTSTRAP_CONFIG}"
+	else
+		LH_DEBOOTSTRAP_SCRIPT="/usr/lib/debootstrap/scripts/${LH_BOOTSTRAP_CONFIG}"
+	fi
+fi
+
+if [ -n "${LH_BOOTSTRAP_INCLUDE}" ]
+then
+	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --include=$(echo ${LH_BOOTSTRAP_INCLUDE} | sed 's|  *|,|g')"
+fi
+
+if [ -n "${LH_BOOTSTRAP_EXCLUDE}" ]
+then
+	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --exclude=$(echo ${LH_BOOTSTRAP_EXCLUDE} | sed 's|  *|,|g')"
+fi
+
+if [ "${LH_USE_FAKEROOT}" != "true" ]
+then
+	if [ -z "${LH_BOOTSTRAP_FLAVOUR}" ]
+	then
+		if In_list "stripped minimal" "${LH_PACKAGES_LISTS}"
+		then
+			DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=minbase"
+		fi
+	else
+		case "${LH_BOOTSTRAP_FLAVOUR}" in
+			stripped|minimal)
+				DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=minbase"
+				;;
+			standard)
+				;;
+
+			*)
+				DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=${LH_BOOTSTRAP_FLAVOUR}"
+		esac
+	fi
+else
+	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=fakechroot"
+fi
+
+if [ "${_VERBOSE}" = "true" ]
+then
+	DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --verbose"
+fi
+
+if [ -x "/usr/sbin/debootstrap" ]
+then
+	if [ "${LH_CACHE_PACKAGES}" = "true" ]
+	then
+		if ls cache/packages_bootstrap/*.deb > /dev/null 2>&1
+		then
+			mkdir -p chroot/var/cache/apt/archives
+			cp cache/packages_bootstrap/*.deb chroot/var/cache/apt/archives
+		fi
+
+		Echo_breakage "Running debootstrap (download-only)... "
+		${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} --download-only "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}" "${LH_DEBOOTSTRAP_SCRIPT}"
+
+		if [ -n "${LH_ROOT_COMMAND}" ]
+		then
+			${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
+		fi
+
+		# Removing old cache
+		rm -f cache/packages_bootstrap/*.deb
+
+		# Saving new cache
+		mkdir -p cache/packages_bootstrap
+		cp chroot/var/cache/apt/archives/*.deb cache/packages_bootstrap
+	fi
+
+	Echo_breakage "Running debootstrap... "
+	${LH_ROOT_COMMAND} debootstrap ${DEBOOTSTRAP_OPTIONS} "${LH_DISTRIBUTION}" chroot "${LH_MIRROR_BOOTSTRAP}" "${LH_DEBOOTSTRAP_SCRIPT}"
+
+	if [ -n "${LH_ROOT_COMMAND}" ]
+	then
+		${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
+	fi
+
+	# Removing bootstrap cache
+	rm -f chroot/var/cache/apt/archives/*.deb
+
+	# Creating stage file
+	Create_stagefile .stage/bootstrap
+else
+	Echo_error "Can't process file /usr/bin/debootstrap (FIXME)"
+	exit 1
+fi
diff --git a/scripts/build/build b/scripts/build/build
new file mode 100755
index 0000000..dcd0cb2
--- /dev/null
+++ b/scripts/build/build
@@ -0,0 +1,75 @@
+#!/bin/sh
+
+# lh_build(1) - build a Debian Live system
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Automatically populating config tree
+if [ -x auto/config ] && [ ! -e .stage/config ]
+then
+	Echo_message "Automatically populating config tree."
+	lh config
+fi
+
+# Read meta config
+if [ "${1}" != "noauto" ] && [ -x auto/build ]
+then
+	Echo_message "Executing auto/build script."
+	./auto/build ${@}
+fi
+
+if [ "${1}" = "noauto" ]
+then
+	shift
+fi
+
+# Setting static variables
+DESCRIPTION="$(Echo 'build a Debian Live system')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+if [ ! -d config ]
+then
+	Echo_warning "No config/ directory; using defaults for all options"
+fi
+
+if [ "$(pwd)" = "/" ]
+then
+	Echo_error "Cannot build live image from the root directory (/)"
+	exit 1
+fi
+
+if echo $(pwd) | grep -qs " "
+then
+	Echo_error "Cannot build live image from a directory containing spaces"
+	exit 1
+fi
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Checking defaults
+Check_defaults
+
+# Bootstrapping system
+lh bootstrap ${*}
+
+# Customizing chroot
+lh chroot ${*}
+
+# Building binary images
+lh binary ${*}
+
+# Building source images
+lh source ${*}
diff --git a/scripts/build/chroot b/scripts/build/chroot
new file mode 100755
index 0000000..99f03db
--- /dev/null
+++ b/scripts/build/chroot
@@ -0,0 +1,80 @@
+#!/bin/sh
+
+# lh_chroot(1) - customize the Debian system
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'customize the Debian system')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Setup cleanup function
+Setup_cleanup
+
+# Configuring chroot
+lh chroot_cache restore ${*}
+lh chroot_devpts install ${*}
+lh chroot_proc install ${*}
+lh chroot_selinuxfs install ${*}
+lh chroot_sysfs install ${*}
+lh chroot_debianchroot install ${*}
+lh chroot_dpkg install ${*}
+lh chroot_sysv-rc install ${*}
+lh chroot_upstart install ${*}
+lh chroot_hosts install ${*}
+lh chroot_resolv install ${*}
+lh chroot_hostname install ${*}
+lh chroot_apt install ${*}
+lh chroot_sources install ${*}
+lh chroot_linux-image install ${*}
+
+# Customizing chroot
+lh chroot_preseed ${*}
+lh chroot_local-preseed ${*}
+lh chroot_tasks ${*}
+lh chroot_packageslists ${*}
+lh chroot_local-packageslists ${*}
+lh chroot_packages ${*}
+lh chroot_local-packages ${*}
+lh chroot_install-packages ${*}
+lh chroot_localization ${*}
+lh chroot_local-includes ${*}
+lh chroot_local-patches ${*}
+lh chroot_sysvinit ${*}
+lh chroot_local-hooks ${*}
+lh chroot_hooks ${*}
+lh chroot_symlinks ${*}
+lh chroot_hacks ${*}
+lh chroot_interactive ${*}
+
+# Deconfiguring chroot
+lh chroot_linux-image remove ${*}
+lh chroot_sources remove ${*}
+lh chroot_apt remove ${*}
+lh chroot_hostname remove ${*}
+lh chroot_resolv remove ${*}
+lh chroot_hosts remove ${*}
+lh chroot_sysv-rc remove ${*}
+lh chroot_upstart remove ${*}
+lh chroot_dpkg remove ${*}
+lh chroot_debianchroot remove ${*}
+lh chroot_sysfs remove ${*}
+lh chroot_selinuxfs remove ${*}
+lh chroot_proc remove ${*}
+lh chroot_devpts remove ${*}
+lh chroot_cache save ${*}
diff --git a/scripts/build/chroot_apt b/scripts/build/chroot_apt
new file mode 100755
index 0000000..c95d649
--- /dev/null
+++ b/scripts/build/chroot_apt
@@ -0,0 +1,242 @@
+#!/bin/sh
+
+# lh_chroot_apt(1) - manage /etc/apt/apt.conf
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'manage /etc/apt/apt.conf')"
+HELP=""
+USAGE="${PROGRAM} {install|install-binary|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+case "${1}" in
+	install|install-binary)
+		Echo_message "Configuring file /etc/apt/apt.conf"
+
+		# Checking stage file
+		Check_stagefile .stage/chroot_apt
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		mkdir -p chroot/etc/apt/apt.conf.d
+
+		# Configuring apt ftp proxy
+		if [ -n "${LH_APT_FTP_PROXY}" ]
+		then
+			echo "Acquire::ftp::Proxy \"${LH_APT_FTP_PROXY}\";" > chroot/etc/apt/apt.conf.d/00ftp-proxy
+		fi
+
+		# Configuring apt http proxy
+		if [ -n "${LH_APT_HTTP_PROXY}" ]
+		then
+			echo "Acquire::http::Proxy \"${LH_APT_HTTP_PROXY}\";" > chroot/etc/apt/apt.conf.d/00http-proxy
+		fi
+
+		# Configuring apt pdiffs
+		case "${LH_APT_PDIFFS}" in
+			true)
+				echo "Acquire::PDiffs \"true\";" > chroot/etc/apt/apt.conf.d/00pdiffs
+				;;
+
+			false)
+				echo "Acquire::PDiffs \"false\";" > chroot/etc/apt/apt.conf.d/00pdiffs
+				;;
+		esac
+
+		# Configuring apt pipeline
+		if [ -n "${LH_APT_PIPELINE}" ]
+		then
+			echo "Acquire::http::Pipeline-Depth \"${LH_APT_PIPELINE}\";" > chroot/etc/apt/apt.conf.d/00pipeline
+		fi
+
+		# Configuring apt recommends
+		case "${LH_APT_RECOMMENDS}" in
+			true)
+				echo "APT::Install-Recommends \"true\";" > chroot/etc/apt/apt.conf.d/00recommends
+				echo "Aptitude::Recommends-Important \"true\";" >> chroot/etc/apt/apt.conf.d/00recommends
+				;;
+
+			false)
+				echo "APT::Install-Recommends \"false\";" > chroot/etc/apt/apt.conf.d/00recommends
+				echo "Aptitude::Recommends-Important \"false\";" >> chroot/etc/apt/apt.conf.d/00recommends
+				;;
+		esac
+
+		# Configuring apt secure
+		case "${LH_APT_SECURE}" in
+			true)
+				echo "APT::Get::AllowUnauthenticated \"false\";" > chroot/etc/apt/apt.conf.d/00secure
+				echo "Aptitude::CmdLine::Ignore-Trust-Violations \"false\";" >> chroot/etc/apt/apt.conf.d/00secure
+				;;
+
+			false)
+				echo "APT::Get::AllowUnauthenticated \"true\";" > chroot/etc/apt/apt.conf.d/00secure
+				echo "Aptitude::CmdLine::Ignore-Trust-Violations \"true\";" >> chroot/etc/apt/apt.conf.d/00secure
+				;;
+		esac
+
+		# Configuring apt config
+		if [ -f config/chroot_apt/apt.conf ]
+		then
+			if [ -f chroot/etc/apt/apt.conf ]
+			then
+				mv chroot/etc/apt/apt.conf chroot/etc/apt/apt.conf.orig
+			fi
+
+			cp config/chroot_apt/apt.conf chroot/etc/apt/apt.conf
+		fi
+
+		# Configuring apt preferences
+		if [ -f config/chroot_apt/preferences ]
+		then
+			if [ -f chroot/etc/apt/preferences ]
+			then
+				mv chroot/etc/apt/preferences chroot/etc/apt/preferences.orig
+			fi
+
+			cp config/chroot_apt/preferences chroot/etc/apt/preferences
+		fi
+
+		if Find_files config/chroot_local-packages/*.deb
+		then
+			echo >> chroot/etc/apt/preferences
+			echo "# Added by lh_chroot_apt ${@}" >> chroot/etc/apt/preferences
+			echo "Package: *" >> chroot/etc/apt/preferences
+			echo "Pin: release o=chroot_local-packages" >> chroot/etc/apt/preferences
+
+			case "${1}" in
+				install)
+					# Ensure local packages have priority
+					echo "Pin-Priority: 1001" >> chroot/etc/apt/preferences
+					;;
+
+				install-binary)
+					# Ensure local packages are not re-installed during lh_binary
+					echo "Pin-Priority: 99" >> chroot/etc/apt/preferences
+
+					echo >> chroot/etc/apt/preferences
+					echo "Package: *" >> chroot/etc/apt/preferences
+					echo "Pin: release o=debian" >> chroot/etc/apt/preferences
+					echo "Pin-Priority: 99" >> chroot/etc/apt/preferences
+					;;
+			esac
+		fi
+
+		# Creating stage file
+		Create_stagefile .stage/chroot_apt
+		;;
+
+	remove)
+		Echo_message "Deconfiguring file /etc/apt/apt.conf"
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		# Deconfiguring aptitude ftp proxy
+		rm -f chroot/etc/apt/apt.conf.d/00ftp-proxy
+
+		# Deconfiguring aptitude http proxy
+		rm -f chroot/etc/apt/apt.conf.d/00http-proxy
+
+		# Deconfiguring aptitude pdiffs
+		if [ "${LH_APT_PDIFFS}" = "true" ]
+		then
+			rm -f chroot/etc/apt/apt.conf.d/00pdiffs
+		fi
+
+		# Deconfiguring aptitude pipeline
+		rm -f chroot/etc/apt/apt.conf.d/00pipeline
+
+		# Deconfiguring aptitude recommends
+		if [ "${LH_APT_RECOMMENDS}" = "true" ]
+		then
+			rm -f chroot/etc/apt/apt.conf.d/00recommends
+		fi
+
+		# Deconfiguring aptitude secure
+		if [ "${LH_APT_SECURE}" = "true" ]
+		then
+			rm -f chroot/etc/apt/apt.conf.d/00secure
+		fi
+
+		# Configuring apt config
+		if [ -f config/chroot_apt/apt.conf ]
+		then
+			if [ -f chroot/etc/apt/apt.conf ]
+			then
+				mv chroot/etc/apt/apt.conf chroot/etc/apt/apt.conf.orig
+			fi
+
+			cp config/chroot_apt/apt.conf chroot/etc/apt/apt.conf
+
+			if [ -f chroot/etc/apt/apt.conf.orig ]
+			then
+				mv chroot/etc/apt/apt.conf.orig chroot/etc/apt/apt.conf
+			fi
+		fi
+
+		# Deconfiguring apt preferences
+		if [ -f config/chroot_apt/preferences ]
+		then
+			if [ -f chroot/etc/apt/preferences ]
+			then
+				mv chroot/etc/apt/preferences chroot/etc/apt/preferences.orig
+			fi
+
+			cp config/chroot_apt/preferences chroot/etc/apt/preferences
+
+			if [ -f chroot/etc/apt/preferences.orig ]
+			then
+				mv chroot/etc/apt/preferences.orig chroot/etc/apt/preferences
+			fi
+		fi
+
+		if Find_files config/chroot_local-packages/*.deb
+		then
+			if [ -f chroot/etc/apt/preferences ]
+			then
+				# delete additions from lh_chroot_apt install|install-binary to preferences
+				sed -i '/# Added by lh_chroot_apt/,$d' chroot/etc/apt/preferences
+				# delete the last empty line
+				sed -i '${/^[[:blank:]]*$/d;}' chroot/etc/apt/preferences
+				# if the resulting preferences file is empty there was no user additions, remove it
+				if [ ! -s chroot/etc/apt/preferences ]
+				then
+					rm -rf chroot/etc/apt/preferences
+				fi
+			fi
+
+		fi
+
+		# Removing stage file
+		rm -f .stage/chroot_apt
+		;;
+
+	*)
+		Usage
+		;;
+esac
diff --git a/scripts/build/chroot_cache b/scripts/build/chroot_cache
new file mode 100755
index 0000000..49cc590
--- /dev/null
+++ b/scripts/build/chroot_cache
@@ -0,0 +1,89 @@
+#!/bin/sh
+
+# lh_chroot_cache(1) - cach chroot stage
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'cache chroot stage')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin caching chroot stage..."
+
+for STAGE in ${LH_CACHE_STAGES}
+do
+	if [ "${STAGE}" = "chroot" ]
+	then
+		case "${1}" in
+			restore)
+				# Checking stage file
+				Check_stagefile .stage/chroot_cache.restore
+
+				if [ -d cache/stages_chroot ]
+				then
+					# Checking lock file
+					Check_lockfile .lock
+
+					# Creating lock file
+					Create_lockfile .lock
+
+					# Removing old chroot
+					rm -rf chroot
+
+					# Restoring old cache
+					${LH_ROOT_COMMAND} cp -a cache/stages_chroot chroot
+
+					if [ -n "${LH_ROOT_COMMAND}" ]
+					then
+						${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) chroot
+					fi
+
+					# Creating stage file
+					Create_stagefile .stage/chroot_cache.restore
+
+					exit 0
+				fi
+				;;
+
+			save)
+				# Checking stage file
+				Check_stagefile .stage/chroot_cache.save
+
+				# Checking lock file
+				Check_lockfile .lock
+
+				# Creating lock file
+				Create_lockfile .lock
+
+				rm -rf cache/stages_chroot
+
+				mkdir -p cache
+
+				${LH_ROOT_COMMAND} cp -a chroot cache/stages_chroot
+
+				if [ -n "${LH_ROOT_COMMAND}" ]
+				then
+					${LH_ROOT_COMMAND} chown -R $(whoami):$(whoami) cache/stages_chroot
+				fi
+
+				# Creating stage file
+				Create_stagefile .stage/chroot_cache.save
+				;;
+		esac
+	fi
+done
diff --git a/scripts/build/chroot_debianchroot b/scripts/build/chroot_debianchroot
new file mode 100755
index 0000000..ae37953
--- /dev/null
+++ b/scripts/build/chroot_debianchroot
@@ -0,0 +1,80 @@
+#!/bin/sh
+
+# lh_chroot_debianchroot(1) - manage /etc/debian_chroot
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'manage /etc/debian_chroot')"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+case "${1}" in
+	install)
+		Echo_message "Configuring file /etc/debian_chroot"
+
+		# Checking stage file
+		Check_stagefile .stage/chroot_debianchroot
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		if [ -f chroot/etc/debian_chroot ]
+		then
+			# Save chroot file
+			mv chroot/etc/debian_chroot chroot/etc/debian_chroot.orig
+		fi
+
+		# Create chroot file
+		echo "live" > chroot/etc/debian_chroot
+
+		# Creating stage file
+		Create_stagefile .stage/chroot_debianchroot
+		;;
+
+	remove)
+		Echo_message "Deconfiguring file /etc/debian_chroot"
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		if [ -f chroot/etc/debian_chroot.orig ]
+		then
+			# Restore chroot file
+			mv chroot/etc/debian_chroot.orig chroot/etc/debian_chroot
+		else
+			# Remove chroot file
+			rm -f chroot/etc/debian_chroot
+		fi
+
+		# Removing stage file
+		rm -f .stage/chroot_debianchroot
+		;;
+
+	*)
+		Usage
+		;;
+esac
diff --git a/scripts/build/chroot_devpts b/scripts/build/chroot_devpts
new file mode 100755
index 0000000..d738d5c
--- /dev/null
+++ b/scripts/build/chroot_devpts
@@ -0,0 +1,85 @@
+#!/bin/sh
+
+# lh_chroot_devpts(1) - mount /dev/pts
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'mount /dev/pts')"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Ensure that a system is built as root
+lh testroot
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+case "${1}" in
+	install)
+		Echo_message "Begin mounting /dev/pts..."
+
+		# Checking stage file
+		Check_stagefile .stage/chroot_devpts
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		if [ "${LH_USE_FAKEROOT}" != "true" ]
+		then
+			# Creating mountpoint
+			mkdir -p chroot/dev/pts
+
+			# Mounting /dev/pts
+			${LH_ROOT_COMMAND} mount devpts-live -t devpts chroot/dev/pts || true
+		fi
+
+		# Creating stage file
+		Create_stagefile .stage/chroot_devpts
+		;;
+
+	remove)
+		Echo_message "Begin unmounting /dev/pts..."
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		# Unmounting /dev/pts
+		if [ "${LH_USE_FAKEROOT}" != "true" ]
+		then
+			if grep -qs "$(pwd)/chroot/dev/pts" /proc/mounts || Find_files chroot/dev/pts/*
+			then
+				${LH_ROOT_COMMAND} umount chroot/dev/pts
+			else
+				${LH_ROOT_COMMAND} umount -f chroot/dev/pts > /dev/null 2>&1 || true
+			fi
+		fi
+
+		# Removing stage file
+		rm -f .stage/chroot_devpts
+		;;
+
+	*)
+		Usage
+		;;
+esac
diff --git a/scripts/build/chroot_dpkg b/scripts/build/chroot_dpkg
new file mode 100755
index 0000000..69f87a4
--- /dev/null
+++ b/scripts/build/chroot_dpkg
@@ -0,0 +1,104 @@
+#!/bin/sh
+
+# lh_chroot_dpkg(1) - manage /sbin/dpkg
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'manage /sbin/dpkg')"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+case "${1}" in
+	install)
+		Echo_message "Configuring file /sbin/start-stop-daemon"
+
+		# Checking stage file
+		Check_stagefile .stage/chroot_dpkg
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		# Save start-stop-daemon program
+		mv chroot/sbin/start-stop-daemon chroot/sbin/start-stop-daemon.orig
+
+		# Create start-stop-daemon program
+
+cat > chroot/sbin/start-stop-daemon << EOF
+#!/bin/sh
+
+exit 0
+EOF
+
+		chmod 755 chroot/sbin/start-stop-daemon
+
+		# Manual hacks for special packages
+
+		# samhain
+		if [ -e /var/state/samhain/samhain_file ]
+		then
+			mv /var/state/samhain/samhain_file /var/state/samhain/samhain_file.orig
+		else
+			mkdir -p /var/state/samhain
+			touch /var/state/samhain/samhain_file
+		fi
+
+		# Creating stage file
+		Create_stagefile .stage/chroot_dpkg
+		;;
+
+	remove)
+		Echo_message "Deconfiguring file /sbin/start-stop-daemon"
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		# Manual hacks for special packages
+
+		# samhain
+		if [ -e /var/state/samhain/samhain_file.orig ]
+		then
+			mv /var/state/samhain/samhain_file.orig /var/state/samhain/samhain_file
+		elif [ -d /var/state/samhain ]
+		then
+			rm -f /var/state/samhain/samhain_file
+			rmdir --ignore-fail-on-non-empty /var/state/samhain || true
+		fi
+
+		# Restore start-stop-daemon program
+		if [ -e chroot/sbin/start-stop-daemon.orig ]
+		then
+			mv chroot/sbin/start-stop-daemon.orig chroot/sbin/start-stop-daemon
+		fi
+
+		# Removing stage file
+		rm -f .stage/chroot_dpkg
+		;;
+
+	*)
+		Usage
+		;;
+esac
diff --git a/scripts/build/chroot_hacks b/scripts/build/chroot_hacks
new file mode 100755
index 0000000..5a3f9ae
--- /dev/null
+++ b/scripts/build/chroot_hacks
@@ -0,0 +1,287 @@
+#!/bin/sh
+
+# lh_chroot_hacks(1) - execute hacks in chroot
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'execute hacks in chroot')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin executing hacks..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_hacks
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Handling default desktop configuration
+for TASK in ${LH_TASKS}
+do
+	case "${LH_DISTRIBUTION}" in
+		lenny)
+			GDM="gdm"
+			;;
+
+		*)
+			GDM="gdm3"
+			;;
+	esac
+
+	case "${TASK}" in
+		gnome-desktop)
+			# gnome is the only desktop environment in this image
+			if [ -z "$(echo ${LH_TASKS} | sed -e 's|gnome-desktop||' -e 's| desktop ||' | grep desktop)" ]
+			then
+				# set display manager
+				echo "${GDM} shared/default-x-display-manager select ${GDM}" > chroot/root/preseed
+				Chroot chroot "debconf-set-selections /root/preseed"
+				rm -f chroot/root/preseed
+				Chroot chroot "dpkg-reconfigure ${GDM}"
+				echo "/usr/bin/${GDM}" > chroot/etc/X11/default-display-manager
+
+				# set session manager
+				Chroot chroot "update-alternatives --set x-session-manager /usr/bin/gnome-session"
+			fi
+			;;
+
+		kde-desktop)
+			# kde is the only desktop-environment in this image
+			if [ -z "$(echo ${LH_TASKS} | sed -e 's|kde-desktop||' -e 's| desktop ||' | grep desktop)" ]
+			then
+				# set display manager
+				echo "kdm shared/default-x-display-manager select kdm" > chroot/root/preseed
+				Chroot chroot "debconf-set-selections /root/preseed"
+				rm -f chroot/root/preseed
+				Chroot chroot "dpkg-reconfigure kdm"
+				echo "/usr/bin/kdm" > chroot/etc/X11/default-display-manager
+
+				# set session manager
+				Chroot chroot "update-alternatives --set x-session-manager /usr/bin/startkde"
+
+				# get rid of resolvconf
+				Chroot chroot "dpkg -P resolvconf"
+			fi
+			;;
+
+		lxde-desktop)
+			# lxde is the only desktop environment in this image
+			if [ -z "$(echo ${LH_TASKS} | sed -e 's|lxde-desktop||' -e 's| desktop ||' | grep desktop)" ]
+			then
+				# set display manager
+				echo "${GDM} shared/default-x-display-manager select ${GDM}" > chroot/root/preseed
+				Chroot chroot "debconf-set-selections /root/preseed"
+				rm -f chroot/root/preseed
+				Chroot chroot "dpkg-reconfigure ${GDM}"
+				echo "/usr/bin/${GDM}" > chroot/etc/X11/default-display-manager
+
+				# set session manager
+				Chroot chroot "update-alternatives --set x-session-manager /usr/bin/startlxde"
+			fi
+			;;
+
+		xfce-desktop)
+			# xfce is the only desktop environment in this image
+			if [ -z "$(echo ${LH_TASKS} | sed -e 's|xfce-desktop||' -e 's| desktop ||' | grep desktop)" ]
+			then
+				# set display manager
+				echo "${GDM} shared/default-x-display-manager select ${GDM}" > chroot/root/preseed
+				Chroot chroot "debconf-set-selections /root/preseed"
+				rm -f chroot/root/preseed
+				Chroot chroot "dpkg-reconfigure ${GDM}"
+				echo "/usr/bin/${GDM}" > chroot/etc/X11/default-display-manager
+
+				# set session manager
+				Chroot chroot "update-alternatives --set x-session-manager /usr/bin/xfce4-session"
+			fi
+			;;
+	esac
+done
+
+# Removing openssh-server hostkeys,
+# they are regenerated by live-config.
+#rm -f chroot/etc/ssh/ssh_host_dsa_key chroot/etc/ssh/ssh_host_dsa_key.pub
+#rm -f chroot/etc/ssh/ssh_host_rsa_key chroot/etc/ssh/ssh_host_rsa_key.pub
+
+# Removing udev mac caching rule
+rm -f chroot/etc/udev/rules.d/*persistent-net.rules
+
+case "${LH_BINARY_IMAGES}" in
+	net)
+		if [ ! -f chroot/usr/bin/smbmount ]
+		then
+			Apt install smbfs
+		fi
+
+		if [ ! -d chroot/etc/initramfs-tools ]
+		then
+			mkdir chroot/etc/initramfs-tools
+		fi
+		if [ ! "$(grep 'MODULES=netboot' chroot/etc/initramfs-tools/initramfs.conf)" ]
+		then
+			# Configuring initramfs for NFS
+cat >> chroot/etc/initramfs-tools/initramfs.conf << EOF
+MODULES=netboot
+BOOT=nfs
+NFSROOT=auto
+EOF
+		fi
+		;;
+esac
+
+# Update initramfs (always, because of udev rules in initrd)
+case "${LH_INITRAMFS}" in
+	live-initramfs)
+		#UPDATE_INITRAMFS_OPTIONS="LIVE_GENERATE_UUID=1"
+		;;
+
+	casper)
+		UPDATE_INITRAMFS_OPTIONS="CASPER_GENERATE_UUID=1"
+		;;
+esac
+
+Chroot chroot "${UPDATE_INITRAMFS_OPTIONS} update-initramfs -k all -t -u"
+
+# Ensure readable permissions on initramfs. loop-aes-utils sets umask to
+# protect GPG keys, which live-helper does not support.
+# Note: Use find rather than chmod on the wildcard, one never knows what
+# people might do in local hooks, and there might be no initrds at all.
+find chroot/boot -name 'initrd*' -print0 | xargs -r -0 chmod go+r
+
+# Remove build systems clock drift
+echo "0.0 0 0.0" > chroot/etc/adjtime
+
+# Remove cruft
+rm -f chroot/boot/initrd*bak*
+rm -f chroot/etc/apt/trusted.gpg~
+rm -f chroot/etc/group- chroot/etc/passwd-
+rm -f chroot/etc/gshadow- chroot/etc/shadow-
+rm -f chroot/var/cache/debconf/*-old
+rm -f chroot/var/lib/dpkg/*-old
+rm -f chroot/var/log/apt/term.log
+
+if [ -n "${LH_ROOT_COMMAND}" ]
+then
+	${LH_ROOT_COMMAND} chown -R --quiet $(whoami):$(whoami) chroot
+fi
+
+case "${LH_INITRAMFS}" in
+	casper)
+		ID="999"
+		;;
+
+	*)
+		ID="1000"
+		;;
+esac
+
+if [ -d chroot/home/${LH_USERNAME} ]
+then
+	chown -R --quiet ${ID}:${ID} chroot/home/${LH_USERNAME}
+fi
+
+if [ "${LH_DEBIAN_INSTALLER}" = "live" ]
+then
+	# This is a temporary hack to get rid of fstab;
+	# needs cleanup in live-initramfs first to proper fix.
+	rm -f chroot/etc/fstab
+
+	# There is a timing issue somewhere when using live-installer
+	# and the apt-get update waypoint: At the time when we're installing
+	# bootloader, it tries to fetch them from the net but the e.g.
+	# 'chroot /target apt-get install grub' fails because of missing
+	# packages lists. As a very cheap workaround, we ensure that the
+	# bootloader is already installed in the image. Very ugly, but it's to
+	# late to fix it in d-i because lenny rc2 has been already released.
+	case "${LH_ARCHITECTURE}" in
+		amd64|i386)
+			case "${LH_BOOTLOADER}" in
+				grub)
+					Apt install grub
+					;;
+
+				grub2)
+					Apt install grub2
+					;;
+			esac
+			;;
+
+		powerpc)
+			Apt install yaboot
+			;;
+	esac
+fi
+
+if [ "${LH_EXPOSED_ROOT}" = "true" ]
+then
+	# Make sure RW dirs exist so that the initramfs script has
+	# a directory in which to bind the tmpfs filesystems
+	COW_DIRECTORIES="/home /live /tmp /var/lib/live /var/lock /var/log /var/run /var/tmp /var/spool"
+
+	for DIRECTORY in ${COW_DIRECTORIES}
+	do
+		mkdir -p chroot/"${DIRECTORY}"
+	done
+
+	# Config files which need to be RW
+	COW_FILES="/etc/adjtime /etc/fstab /etc/hostname /etc/hosts /etc/live.conf /etc/network/interfaces /etc/resolv.conf /etc/udev/rules.d/*persistent-net.rules /etc/udev/rules.d/*persistent-cd.rules /etc/X11/xorg.conf"
+
+	# Where we will store RW config files
+	RW_DIRECTORY="/var/lib/live"
+
+	for FILE in ${COW_FILES}
+	do
+		DIRECTORY="$(dirname ${FILE})"
+		FILE="$(basename ${FILE})"
+		RELATIVE_PATH="$(echo ${DIRECTORY} | sed 's|[^/]\+|..|g; s|^/||g')"
+
+		# Touch files in case they don't yet exist
+		mkdir -p chroot/${DIRECTORY}
+		touch chroot/${DIRECTORY}/${FILE}
+
+		# Move files to the read-write directory
+		mkdir -p chroot/${RW_DIRECTORY}/${DIRECTORY}
+		mv chroot/${DIRECTORY}/${FILE} chroot/${RW_DIRECTORY}/${DIRECTORY}
+
+		# Create a symbolic link to RW config file
+		ln -s ${RELATIVE_PATH}/${RW_DIRECTORY}/${DIRECTORY}/${FILE} chroot/${DIRECTORY}/${FILE}
+	done
+
+	# Mount doesn't write to a symlink so use /proc/mounts instead,
+	# see debian bug #154438 for more info
+	rm -f chroot/etc/mtab
+	ln -s /proc/mounts chroot/etc/mtab
+fi
+
+# Show popular warnings
+if [ -e chroot/etc/init.d/resolvconf ]
+then
+	Echo_warning "Your live system appears to include resolvconf which is by its nature incompatible in most ways with debian-live."
+	Echo_warning "Keeping resolvconf installed *can* lead to broken network support in the resulting live system."
+	Echo_warning "Unless you really know what you are doing, we recommend that you neither install resolvconf explicitly nor implicitly through another package's relation (e.g. by having automatic installation of recommended packages to true)."
+fi
+
+# Creating stage file
+Create_stagefile .stage/chroot_hacks
diff --git a/scripts/build/chroot_hooks b/scripts/build/chroot_hooks
new file mode 100755
index 0000000..f5864d8
--- /dev/null
+++ b/scripts/build/chroot_hooks
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+# lh_chroot_hooks(1) - execute hooks in chroot
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'execute hooks in chroot')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin executing hooks..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_hooks
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Processing hooks
+HOOKS="$(echo ${LH_HOOKS} ${LH_PACKAGES_LISTS} ${LH_TASKS} | sed -e 's| |\n|g' | sort -u)"
+
+for HOOK in ${HOOKS}
+do
+	if [ -f ${LH_BASE:-/usr/share/live-helper}/hooks/"${HOOK}" ]
+	then
+		# Copying hook
+		cp ${LH_BASE:-/usr/share/live-helper}/hooks/"${HOOK}" chroot/root
+
+		# Making hook executable
+		if [ ! -x chroot/root/"${HOOK}" ]
+		then
+			chmod +x chroot/root/"${HOOK}"
+		fi
+
+		# Executing hook
+		Chroot chroot "./root/${HOOK}" || ( Echo_error "${HOOK} failed (exit non-zero). You should check for errors."; exit 1 )
+
+		# Removing hook
+		rm -f chroot/root/"${HOOK}"
+
+		# Creating stage file
+		Create_stagefile .stage/chroot_hooks
+	fi
+done
diff --git a/scripts/build/chroot_hostname b/scripts/build/chroot_hostname
new file mode 100755
index 0000000..6046f65
--- /dev/null
+++ b/scripts/build/chroot_hostname
@@ -0,0 +1,94 @@
+#!/bin/sh
+
+# lh_chroot_hostname(1) - manage /bin/hostname
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'manage /bin/hostname')"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+case "${1}" in
+	install)
+		Echo_message "Configuring file /etc/hostname"
+
+		# Checking stage file
+		Check_stagefile .stage/chroot_hostname
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		# Save hostname
+		mv chroot/bin/hostname chroot/bin/hostname.orig
+
+		# Create hostname file
+		echo "localhost.localdomain" > chroot/etc/hostname
+
+		Echo_message "Configuring file /bin/hostname"
+
+		# Create hostname program
+
+cat > chroot/bin/hostname << EOF
+#!/bin/sh
+
+echo "localhost.localdomain"
+EOF
+
+		chmod 755 chroot/bin/hostname
+
+		# Creating stage file
+		Create_stagefile .stage/chroot_hostname
+		;;
+
+	remove)
+		Echo_message "Deconfiguring file /etc/hostname"
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		# Copying hostname from local-includes, if existing
+		if [ -e config/chroot_local-includes/etc/hostname ]
+		then
+			cp -a config/chroot_local-includes/etc/hostname chroot/etc/hostname
+		fi
+
+		Echo_message "Deconfiguring file /bin/hostname"
+
+		# Restore hostname file
+		if [ -e chroot/bin/hostname.orig ]
+		then
+			mv chroot/bin/hostname.orig chroot/bin/hostname
+		fi
+
+		# Removing stage file
+		rm -f .stage/chroot_hostname
+		;;
+
+	*)
+		Usage
+		;;
+esac
diff --git a/scripts/build/chroot_hosts b/scripts/build/chroot_hosts
new file mode 100755
index 0000000..ce418dd
--- /dev/null
+++ b/scripts/build/chroot_hosts
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+# lh_chroot_hosts(1) - manage /etc/hosts
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'manage /etc/hosts')"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+case "${1}" in
+	install)
+		Echo_message "Configuring file /etc/hosts"
+
+		# Checking stage file
+		Check_stagefile .stage/chroot_hosts
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		if [ -f chroot/etc/hosts ]
+		then
+			# Save hosts file
+			mv chroot/etc/hosts chroot/etc/hosts.orig
+		fi
+
+		# Creating hosts file
+
+cat > chroot/etc/hosts << EOF
+127.0.0.1	localhost localhost.localdomain
+127.0.1.1	debian
+EOF
+
+		if [ -f /etc/hosts ]
+		then
+			# Append hosts file
+			#grep -e "127.0.0.1" -e "127.0.1.1" /etc/hosts >> chroot/etc/hosts
+			cat /etc/hosts >> chroot/etc/hosts
+		fi
+
+		# Creating stage file
+		Create_stagefile .stage/chroot_hosts
+		;;
+
+	remove)
+		Echo_message "Deconfiguring file /etc/hosts"
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		if [ -e config/chroot_local-includes/etc/hosts ]
+		then
+			# Copying local hosts
+			cp -a config/chroot_local-includes/etc/hosts chroot/etc/hosts
+			rm -f chroot/etc/hosts.orig
+		elif [ -f chroot/etc/hosts.orig ]
+		then
+			# Restore hosts file
+			mv chroot/etc/hosts.orig chroot/etc/hosts
+		else
+			# Blank out hosts file, don't remove in case
+			# its a symlink, as in the case of exposedroot mode
+			Truncate chroot/etc/hosts
+		fi
+
+		# Removing stage file
+		rm -f .stage/chroot_hosts
+		;;
+
+	*)
+		Usage
+		;;
+esac
diff --git a/scripts/build/chroot_install-packages b/scripts/build/chroot_install-packages
new file mode 100755
index 0000000..3b491ad
--- /dev/null
+++ b/scripts/build/chroot_install-packages
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+# lh_chroot_install-packages(1) - install queued packages into chroot
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'install queued packages into chroot')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin installing packages..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_install-packages
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ -e chroot/root/chroot_packages ] && [ -s chroot/root/chroot_packages ]
+then
+	# Restoring cache
+	Restore_cache cache/packages_chroot
+
+	# Installing packages
+	case "${LH_APT}" in
+		apt|apt-get)
+			Chroot chroot "xargs --arg-file=/root/chroot_packages apt-get ${APT_OPTIONS} install"
+			;;
+
+		aptitude)
+			Chroot chroot "xargs --arg-file=/root/chroot_packages aptitude ${APTITUDE_OPTIONS} install"
+			;;
+	esac
+
+	# Tidying up
+	rm -f chroot/root/chroot_packages
+
+	# Saving cache
+	Save_cache cache/packages_chroot
+
+fi
+
+# Creating stage file
+Create_stagefile .stage/chroot_install-packages
diff --git a/scripts/build/chroot_interactive b/scripts/build/chroot_interactive
new file mode 100755
index 0000000..dc5461d
--- /dev/null
+++ b/scripts/build/chroot_interactive
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+# lh_chroot_interactive(1) - make build interactive
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'make build interactive')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_INTERACTIVE}" = "false" ]
+then
+	exit 0
+fi
+
+Echo_message "Begin interactive build..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_interactive
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+case "${LH_INTERACTIVE}" in
+	true|shell)
+		Echo_message "Pausing build: starting interactive shell..."
+			Chroot chroot "/bin/bash --login"
+		;;
+		x11)
+		Echo_message "Pausing build: starting interactive X11..."
+			Chroot chroot "startx"
+		;;
+		xnest)
+		Echo_message "Pausing build: starting interactive Xnest..."
+			#Chroot chroot "" # FIXME
+		;;
+esac
+
+# Creating stage file
+Create_stagefile .stage/chroot_symlinks
diff --git a/scripts/build/chroot_linux-image b/scripts/build/chroot_linux-image
new file mode 100755
index 0000000..5f19775
--- /dev/null
+++ b/scripts/build/chroot_linux-image
@@ -0,0 +1,107 @@
+#!/bin/sh
+
+# lh_chroot_linux-image(1) - manage /etc/kernel-img.conf
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'manage /etc/kernel-img.conf')"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+case "${1}" in
+	install)
+		Echo_message "Configuring file /etc/kernel-img.conf"
+
+		# Checking stage file
+		Check_stagefile .stage/chroot_linux-image
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		if [ -f chroot/etc/kernel-img.conf ]
+		then
+			# Saving kernel-img.conf
+			cp chroot/etc/kernel-img.conf chroot/etc/kernel-img.conf.old
+		fi
+
+		# Configuring kernel-img.conf
+cat >> chroot/etc/kernel-img.conf << EOF
+do_bootloader = No
+do_initrd = Yes
+warn_initrd = No
+EOF
+
+		# Diverting update-initramfs
+		#if [ "${LH_INITRAMFS}" = "live-initramfs" ]
+		#then
+		#	mv chroot/usr/sbin/update-initramfs chroot/usr/sbin/update-initramfs.live-helper
+		#fi
+
+		if [ "${LH_LINUX_PACKAGES}" != "none" ]
+		then
+			for FLAVOUR in ${LH_LINUX_FLAVOURS}
+			do
+				for PACKAGE in ${LH_LINUX_PACKAGES}
+				do
+					echo ${PACKAGE}-${FLAVOUR} >> chroot/root/chroot_packages
+				done
+			done
+		fi
+
+		# Queue installation of linux-image and ${LH_INITRAMFS}
+		if [ "${LH_INITRAMFS}" != "none" ]
+		then
+			echo ${LH_INITRAMFS} >> chroot/root/chroot_packages
+		fi
+
+		# Creating stage file
+		Create_stagefile .stage/chroot_linux-image
+		;;
+
+	remove)
+		Echo_message "Deconfiguring file /etc/kernel-img.conf"
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		if [ -f chroot/etc/kernel-img.conf.old ]
+		then
+			# Restoring kernel-img.conf file
+			mv chroot/etc/kernel-img.conf.old chroot/etc/kernel-img.conf
+		else
+			# Removing kernel-img.conf file
+			Truncate chroot/etc/kernel-img.conf
+		fi
+
+		# Removing stage file
+		rm -f .stage/chroot_linux-image
+		;;
+
+	*)
+		Usage
+		;;
+esac
diff --git a/scripts/build/chroot_local-hooks b/scripts/build/chroot_local-hooks
new file mode 100755
index 0000000..1cca5e4
--- /dev/null
+++ b/scripts/build/chroot_local-hooks
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+# lh_chroot_local-hooks(1) - execute local hooks in chroot
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'execute local hooks in chroot')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin executing local hooks..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_local-hooks
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Processing local-hooks
+if Find_files config/chroot_local-hooks/*
+then
+	# Restoring cache
+	Restore_cache cache/packages_chroot
+
+	for HOOK in config/chroot_local-hooks/*
+	do
+		# Copying hook
+		cp "${HOOK}" chroot/root
+
+		# Making hook executable
+		if [ ! -x chroot/root/"$(basename ${HOOK})" ]
+		then
+			chmod +x chroot/root/"$(basename ${HOOK})"
+		fi
+
+		# Executing hook
+		Chroot chroot "/root/$(basename ${HOOK})" || ( Echo_error "${HOOK} failed (exit non-zero). You should check for errors."; exit 1 )
+
+		# Removing hook
+		rm -f chroot/root/"$(basename ${HOOK})"
+	done
+
+	# Saving cache
+	Save_cache cache/packages_chroot
+
+	# Creating stage file
+	Create_stagefile .stage/chroot_local-hooks
+fi
diff --git a/scripts/build/chroot_local-includes b/scripts/build/chroot_local-includes
new file mode 100755
index 0000000..5a4052f
--- /dev/null
+++ b/scripts/build/chroot_local-includes
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+# lh_chroot_local-includes(1) - copy local files into chroot
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'copy local files into chroot')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin copying chroot local includes..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_local-includes
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if Find_files config/chroot_local-includes/
+then
+	# Copying includes
+	cd config/chroot_local-includes
+	find . | cpio -dmpu --no-preserve-owner "${OLDPWD}"/chroot
+	cd "${OLDPWD}"
+
+	# Creating stage file
+	Create_stagefile .stage/chroot_local-includes
+fi
diff --git a/scripts/build/chroot_local-packages b/scripts/build/chroot_local-packages
new file mode 100755
index 0000000..a9d39bd
--- /dev/null
+++ b/scripts/build/chroot_local-packages
@@ -0,0 +1,47 @@
+#!/bin/sh
+
+# lh_chroot_local-packages(1) - queue install of local packages into chroot
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'queue install of local packages into chroot')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin queueing installation of local packages..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_local-packages
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if Find_files chroot/root/local-packages/*.deb
+then
+	gunzip < chroot/root/local-packages/Packages.gz | awk '/^Package: / { print $2 }' \
+		>> chroot/root/chroot_packages
+
+	# Creating stage file
+	Create_stagefile .stage/chroot_local-packages
+fi
diff --git a/scripts/build/chroot_local-packageslists b/scripts/build/chroot_local-packageslists
new file mode 100755
index 0000000..cee46e6
--- /dev/null
+++ b/scripts/build/chroot_local-packageslists
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+# lh_chroot_local-packageslists(1) - queue install of local packages lists into chroot
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'queue install of local packages lists into chroot')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin queueing installation of local packages lists..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_local-packageslists
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if ls config/chroot_local-packageslists/*.list > /dev/null 2>&1
+then
+	for LIST in config/chroot_local-packageslists/*.list
+	do
+		# Generating local package list
+		Expand_packagelist "$(basename ${LIST})" "config/chroot_local-packageslists" \
+			>> chroot/root/chroot_packages
+	done
+
+	# Creating stage file
+	Create_stagefile .stage/chroot_local-packageslists
+fi
diff --git a/scripts/build/chroot_local-patches b/scripts/build/chroot_local-patches
new file mode 100755
index 0000000..6c5e8b4
--- /dev/null
+++ b/scripts/build/chroot_local-patches
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+# lh_chroot_local-patches(1) - apply local patches against chroot
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'apply local patches against chroot')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin applying chroot local patches..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_local-patches
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if Find_files config/chroot_local-patches/
+then
+	# Restoring cache
+	Restore_cache cache/packages_chroot
+
+	# Checking depends
+	Check_package chroot/usr/bin/patch patch
+
+	# Installing depends
+	Install_package
+
+	for PATCH in config/chroot_local-patches/*
+	do
+		Echo_message "Applying patch %s..." "${PATCH}"
+		Chroot chroot "patch -p1" < ${PATCH}
+	done
+
+	# Removing depends
+	Remove_package
+
+	# Saving cache
+	Save_cache cache/packages_chroot
+
+	# Creating stage file
+	Create_stagefile .stage/chroot_local-patches
+fi
diff --git a/scripts/build/chroot_local-preseed b/scripts/build/chroot_local-preseed
new file mode 100755
index 0000000..82eaa17
--- /dev/null
+++ b/scripts/build/chroot_local-preseed
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+# lh_chroot_local-preseed(1) - use debconf local preseeding file
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'execute local preseed in chroot')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin executing local preseeds..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_local-preseed
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if Find_files config/chroot_local-preseed/*
+then
+	# Check dependency
+	Check_package chroot/usr/bin/debconf-set-selections debconf
+
+	# Install dependency
+	Install_package
+
+	for PRESEED in config/chroot_local-preseed/*
+	do
+		# Copying local preseed
+		cp "${PRESEED}" chroot/root/preseed
+
+		Chroot chroot "debconf-set-selections /root/preseed"
+
+		# Removing local preseed file
+		rm -f chroot/root/preseed
+	done
+
+	# Remove dependency
+	Remove_package
+
+	# Creating stage file
+	Create_stagefile .stage/chroot_local-preseed
+fi
diff --git a/scripts/build/chroot_localization b/scripts/build/chroot_localization
new file mode 100755
index 0000000..eebfd6d
--- /dev/null
+++ b/scripts/build/chroot_localization
@@ -0,0 +1,659 @@
+#!/bin/sh
+
+# lh_chroot_localization(1) - install localization packages into chroot
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'install localization packages into chroot')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin installing localization packages..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_localization
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Setting localizations
+if [ -n "${LH_LANGUAGE}" ]
+then
+	case "${LH_LANGUAGE}" in
+		af)
+			# Afrikaans
+			LOCALIZATIONS="iceweasel kde openoffice"
+			;;
+
+		as-in)
+			# Assamese
+			LOCALIZATIONS="openoffice"
+			;;
+
+		ar)
+			# Arabic
+			LOCALIZATIONS="iceweasel kde openoffice"
+			;;
+
+		az)
+			# Azerbaijani
+			LOCALIZATIONS="kde"
+			;;
+
+		be)
+			# Belarusian
+			LOCALIZATIONS="iceape iceweasel openoffice"
+
+			# Overrides
+			OPENOFFICE="be-by"
+			;;
+
+		bg)
+			# Bulgarian
+			LOCALIZATIONS="icedove iceweasel kde openoffice"
+			;;
+
+		bn)
+			# Bengali
+			LOCALIZATIONS="kde openoffice"
+			;;
+
+		br)
+			# Breton
+			LOCALIZATIONS="kde openoffice"
+			;;
+
+		bs)
+			# Bosnian
+			LOCALIZATION="kde openoffice"
+			;;
+
+		ca)
+			# Catalan
+			LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
+			;;
+
+		cs)
+			# Czech
+			LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
+			;;
+
+		cy-gb)
+			# Welsh
+			LOCALIZATIONS="iceweasel kde koffice openoffice"
+
+			# Overrides
+			KDE="cy"
+			KOFFICE="cy"
+			OPENOFFICE="cy"
+			;;
+
+		da)
+			# Danish
+			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+			;;
+
+		de)
+			# German
+			LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
+			;;
+
+		dz-bt)
+			# Dzongkha
+			LOCALIZATIONS="iceweasel openoffice"
+
+			# Overrides
+			OPENOFFICE="dz"
+			;;
+
+		el)
+			# Greek
+			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+			;;
+
+		en-gb)
+			# English (Great Britain)
+			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+
+			# Overrides
+			KDE="engb"
+			KOFFICE="engb"
+			;;
+
+		en-za)
+			# English (South Africa)
+			LOCALIZATIONS="openoffice"
+			;;
+
+		eo)
+			# Esperanto
+			LOCALIZATIONS="kde openoffice"
+			;;
+
+		es-ar)
+			# Spanish (Argentina)
+			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+
+			# Overrides
+			KDE="es"
+			KOFFICE="es"
+			OPENOFFICE="es"
+			;;
+
+		es-es)
+			# Spanish (Spain)
+			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+
+			# Overrides
+			KDE="es"
+			KOFFICE="es"
+			OPENOFFICE="es"
+			;;
+
+		et-ee)
+			# Estonian
+			LOCALIZATIONS="iceweasel kde koffice openoffice"
+
+			# Overrides
+			KDE="et"
+			KOFFICE="et"
+			OPENOFFICE="et"
+			;;
+
+		eu)
+			# Basque
+			LOCALIZATIONS="icedove iceweasel kde koffice"
+			;;
+
+		fa-ir)
+			# Persian
+			LOCALIZATIONS="iceweasel kde openoffice"
+
+			# Overrides
+			KDE="fa"
+			OPENOFFICE="fa"
+			;;
+
+		fi)
+			# Finnish
+			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+			;;
+
+		fr)
+			# French
+			LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
+			;;
+
+		fur-it)
+			# Furlan
+			LOCALIZATIONS="iceweasel"
+			;;
+
+		fy-nl)
+			# Frisian
+			LOCALIZATIONS="iceweasel kde"
+
+			# Overrides
+			KDE="fy"
+			;;
+
+		ga-ie)
+			# Irish (Ireland)
+			LOCALIZATIONS="icedove iceweasel kde openoffice"
+
+			# Overrides
+			ICEDOVE="ga"
+			KDE="ga"
+			OPENOFFICE="ga"
+			;;
+
+		gl)
+			# Galician
+			LOCALIZATIONS="kde"
+			;;
+
+		gu-in)
+			# Gujarati (India)
+			LOCALIZATIONS="icedove iceweasel openoffice"
+
+			# Overrides
+			ICEDOVE="gu"
+			;;
+
+		he)
+			# Hebrew
+			LOCALIZATIONS="iceape icedove iceweasel kde openoffice"
+			;;
+
+		hi)
+			# Hindi
+			LOCALIZATIONS="kde openoffice"
+			;;
+
+		hr)
+			# Croatian
+			LOCALIZATIONS="kde koffice openoffice"
+			;;
+
+		hu)
+			# Hungarian
+			LOCALIZATIONS="icedove iceweasel kde openoffice"
+			;;
+
+		in)
+			# Indic
+			LOCALIZATIONS="openoffice"
+			;;
+
+		is)
+			# Icelandic
+			LOCALIZATIONS="kde"
+			;;
+
+		it)
+			# Italian
+			LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
+			;;
+
+		ja)
+			# Japanese
+			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+			;;
+
+		ka)
+			# Georgian
+			LOCALIZATIONS="iceweasel openoffice"
+			;;
+
+		km)
+			# Khmer
+			LOCALIZATIONS="kde openoffice"
+			;;
+
+		ko)
+			# Korean
+			LOCALIZATIONS="icedove iceweasel kde openoffice"
+			;;
+
+		ku)
+			# Kurdish
+			LOCALIZATIONS="iceweasel openoffice"
+			;;
+
+		lo)
+			# Lao
+			LOCALIZATIONS="openoffice"
+			;;
+
+		lt)
+			# Lithuanian
+			LOCALIZATIONS="icedove iceweasel kde openoffice"
+			;;
+
+		lv)
+			# Latvian
+			LOCALIZATIONS="kde koffice openoffice"
+			;;
+
+		mk)
+			# Macedonian
+			LOCALIZATIONS="icedove iceweasel kde openoffice"
+			;;
+
+		ml-in)
+			# Malayalam
+			LOCALIZATIONS="openoffice"
+			;;
+
+		mn)
+			# Mongolian
+			LOCALIZATIONS="iceweasel kde"
+			;;
+
+		ms)
+			# Malay
+			LOCALIZATIONS="kde koffice"
+			;;
+
+		nb-no)
+			# Bokmaal (Norway)
+			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+
+			# Overrides
+			ICEDOVE="nb"
+			KDE="nb"
+			KOFFICE="nb"
+			OPENOFFICE="nb"
+			;;
+
+		nds)
+			# Low Saxon
+			LOCALIZATIONS="kde"
+			;;
+
+		ne)
+			# Nepalese
+			LOCALIZATIONS="openoffice"
+			;;
+
+		nl)
+			# Dutch
+			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+			;;
+
+		nn-no)
+			# Nynorsk (Norway)
+			LOCALIZATIONS="iceweasel kde openoffice"
+
+			# Overrides
+			KDE="nn"
+			OPENOFFICE="nn"
+			;;
+
+		nr)
+			# Ndebele
+			LOCALIZATIONS="openoffice"
+			;;
+
+		ns)
+			# Northernsotho
+			LOCALIZATIONS="openoffice"
+			;;
+
+		or-in)
+			# Oriya
+			LOCALIZATIONS="openoffice"
+			;;
+
+		pa-in)
+			# Punjabi (India)
+			LOCALIZATIONS="icedove iceweasel kde openoffice"
+
+			# Overrides
+			ICEDOVE="pa"
+			KDE="pa"
+			;;
+
+		pl)
+			# Polish
+			LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
+			;;
+
+		pt-br)
+			# Portugese (Brazil)
+			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+
+			# Overrides
+			KDE="ptbr"
+			KOFFICE="ptbr"
+			;;
+
+		pt-pt)
+			# Portugese (Portugal)
+			LOCALIZATIONS="iceweasel kde koffice openoffice"
+
+			# Overrides
+			KDE="pt"
+			KOFFICE="pt"
+			OPENOFFICE="pt"
+			;;
+
+		ro)
+			# Romanian
+			LOCALIZATIONS="iceweasel kde"
+			;;
+
+		roa-es-val)
+			# Valencian (Spain)
+			LOCALIZATIONS="iceweasel"
+			;;
+
+		ru)
+			# Russian
+			LOCALIZATIONS="iceape icedove iceweasel kde koffice openoffice"
+			;;
+
+		rw)
+			# Kinarwanda
+			LOCALIZATIONS="kde openoffice"
+			;;
+
+		se)
+			# Northern Sami
+			LOCALIZATIONS="kde"
+			;;
+
+		sk)
+			# Slovak
+			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+			;;
+
+		sl)
+			# Slovenian
+			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+			;;
+
+		sr-cs)
+			# Serbian
+			LOCALIZATIONS="kde koffice openoffice"
+
+			# Overrides
+			KDE="sr"
+			KOFFICE="sr"
+			;;
+
+		sr-latin)
+			# Latin Serbian
+			LOCALIZATIONS="kde koffice"
+
+			# Overrides
+			KDE="srlatin"
+			KOFFICE="srlatin"
+			;;
+
+		ss)
+			# Swazi
+			LOCALIZATIONS="kde openoffice"
+			;;
+
+		st)
+			# Southern_sotho
+			LOCALIZATIONS="openoffice"
+			;;
+
+		sv-se)
+			# Swedish
+			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+
+			# Overrides
+			ICEDOVE="sv"
+			KDE="sv"
+			KOFFICE="sv"
+			OPENOFFICE="sv"
+			;;
+
+		ta-in)
+			# Tamil
+			LOCALIZATIONS="kde openoffice"
+
+			# Overrides
+			KDE="ta"
+			;;
+
+		te-in)
+			# Telugu
+			LOCALIZATIONS="openoffice"
+			;;
+
+		tg)
+			# Tajik
+			LOCALIZATIONS="kde openoffice"
+			;;
+
+		th)
+			# Thai
+			LOCALIZATIONS="openoffice"
+			;;
+
+		tn)
+			# Tswana
+			LOCALIZATIONS="openoffice"
+			;;
+
+		tr)
+			# Turkish
+			LOCALIZATIONS="icedove iceweasel kde kofffice openoffice"
+			;;
+
+		ts)
+			# Tsonga
+			LOCALIZATIONS="openoffice"
+			;;
+
+		uk-ua)
+			# Ukrainian
+			LOCALIZATIONS="icedove iceweasel kde kofffice openoffice"
+
+			# Overrides
+			ICEDOVE="uk"
+			KDE="uk"
+			KDE="uk"
+			OPENOFFICE="uk"
+			;;
+
+		uz)
+			# Uzbek
+			LOCALIZATIONS="kde"
+			;;
+
+		ve)
+			# Venda
+			LOCALIZATIONS="openoffice"
+			;;
+
+		vi)
+			# Vietnamese
+			LOCALIZATIONS="openoffice"
+			;;
+
+		xh)
+			# Xhosa
+			LOCALIZATIONS="openoffice"
+			;;
+
+		za)
+			# South African
+			LOCALIZATIONS="openoffice"
+			;;
+
+		zh-cn)
+			# Chinese (China)
+			LOCALIZATIONS="icedove iceweasel kde koffice openoffice"
+
+			# Overrides
+			KDE="zhcn"
+			KOFFICE="zhcn"
+			;;
+
+		zh-tw)
+			# Chinese (Taiwan)
+			LOCALIZATIONS="iceweasel kde koffice openoffice"
+
+			# Overrides
+			KDE="zhtw"
+			KOFFICE="zhtw"
+			;;
+
+		zu)
+			# Zulu
+			LOCALIZATIONS="openoffice"
+			;;
+	esac
+
+	# Setting languages
+	ICEAPE="${ICEAPE:-$LH_LANGUAGE}"
+	ICEDOVE="${ICEDOVE:-$LH_LANGUAGE}"
+	ICEWEASEL="${ICEWEASEL:-$LH_LANGUAGE}"
+	KDE="${KDE:-$LH_LANGUAGE}"
+	KOFFICE="${KOFFICE:-$LH_LANGUAGE}"
+	OPENOFFICE="${OPENOFFICE:-$LH_LANGUAGE}"
+
+	# Setting packages
+	for LOCALIZATION in ${LOCALIZATIONS}
+	do
+		case "${LOCALIZATION}" in
+			iceape)
+				Check_installed chroot/usr/bin/iceape iceape; [ $INSTALL_STATUS -eq 0 ] && Check_package "" iceweasel-l10n-"${ICEAPE}"
+				;;
+
+			icedove)
+				Check_installed chroot/usr/bin/icedove icedove
+				if [ $INSTALL_STATUS -eq 0 ]
+				then
+					if [ "${LH_DISTRIBUTION}" = lenny ]
+					then
+						Check_package "" icedove-locale-"${ICEDOVE}"
+					else
+						Check_package "" icedove-l10n-"${ICEDOVE}"
+					fi
+				fi
+				;;
+
+			iceweasel)
+				Check_installed chroot/usr/bin/iceweasel iceweasel; [ $INSTALL_STATUS -eq 0 ] && Check_package "" iceweasel-l10n-"${ICEWEASEL}"
+				;;
+
+			kde)
+				Check_installed chroot/usr/bin/kstart kdebase-bin; [ $INSTALL_STATUS -eq 0 ] && Check_package "" kde-i18n-"${KDE}"
+				;;
+
+			koffice)
+				Check_installed chroot/usr/bin/koconverter koffice; [ $INSTALL_STATUS -eq 0 ] && Check_package "" koffice-i18n-"${KOFFICE}"
+				;;
+
+			openoffice)
+				Check_installed chroot/usr/bin/ooffice openoffice.org-common; [ $INSTALL_STATUS -eq 0 ] && Check_package "" openoffice.org-l10n-"${OPENOFFICE}"
+				;;
+		esac
+	done
+
+	if [ "${LH_DISTRIBUTION}" = "lenny" ]
+	then
+		Check_installed chroot/usr/bin/gwenview gwenview; [ $INSTALL_STATUS -eq 0 ] && Check_package "" gwenview-i18n
+	fi
+
+	Check_installed chroot/usr/bin/k3b k3b; [ $INSTALL_STATUS -eq 0 ] && Check_package "" k3b-i18n
+
+	# Restoring cache
+	Restore_cache cache/packages_chroot
+
+	# Installing packages
+	Install_package
+
+	# Saving cache
+	Save_cache cache/packages_chroot
+
+	# Creating stage file
+	Create_stagefile .stage/chroot_localization
+fi
diff --git a/scripts/build/chroot_packages b/scripts/build/chroot_packages
new file mode 100755
index 0000000..b612cf9
--- /dev/null
+++ b/scripts/build/chroot_packages
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+# lh_chroot_packages(1) - queue install of packages into chroot
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'queue install of packages into chroot')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin queueing installation of packages..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_packages
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ -n "${LH_PACKAGES}" ] && [ "${LH_PACKAGES}" != "none" ]
+then
+	echo ${LH_PACKAGES} >> chroot/root/chroot_packages
+
+	# Creating stage file
+	Create_stagefile .stage/chroot_packages
+fi
diff --git a/scripts/build/chroot_packageslists b/scripts/build/chroot_packageslists
new file mode 100755
index 0000000..00699d7
--- /dev/null
+++ b/scripts/build/chroot_packageslists
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+# lh_chroot_packageslists(1) - queue install of packages lists into chroot
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'queue install of packages lists into chroot')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin queueing installation of packages lists..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_packageslists
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ -n "${LH_PACKAGES_LISTS}" ] && [ "${LH_PACKAGES_LISTS}" != "none" ]
+then
+
+	for LIST in ${LH_PACKAGES_LISTS}
+	do
+		# Generating package list
+		Expand_packagelist "${LIST}" >> chroot/root/chroot_packages
+	done
+
+	# Creating stage file
+	Create_stagefile .stage/chroot_packageslists
+fi
diff --git a/scripts/build/chroot_preseed b/scripts/build/chroot_preseed
new file mode 100755
index 0000000..4ec7b2f
--- /dev/null
+++ b/scripts/build/chroot_preseed
@@ -0,0 +1,65 @@
+#!/bin/sh
+
+# lh_chroot_preseed(1) - use debconf preseeding file
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'execute preseed in chroot')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin executing preseed..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_preseed
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Processing preseeds
+for PRESEED in ${LH_PACKAGES_LISTS} ${LH_TASKS}
+do
+	if [ -f ${LH_BASE:-/usr/share/live-helper}/preseed/"${PRESEED}" ]
+	then
+		# Check dependency
+		Check_package chroot/usr/bin/debconf-set-selections debconf
+
+		# Install dependency
+		Install_package
+
+		# Copying preseed
+		cp "${PRESEED}" chroot/root/preseed
+
+		Chroot chroot "debconf-set-selections /root/preseed"
+
+		# Removing preseed file
+		rm -f chroot/root/preseed
+
+		# Remove dependency
+		Remove_package
+
+		# Creating stage file
+		Create_stagefile .stage/chroot_preseed
+	fi
+done
diff --git a/scripts/build/chroot_proc b/scripts/build/chroot_proc
new file mode 100755
index 0000000..6992ad6
--- /dev/null
+++ b/scripts/build/chroot_proc
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# lh_chroot_proc(1) - mount /proc
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'mount /proc')"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Ensure that a system is built as root
+lh testroot
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+case "${1}" in
+	install)
+		Echo_message "Begin mounting /proc..."
+
+		# Checking stage file
+		Check_stagefile .stage/chroot_proc
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		if [ "${LH_USE_FAKEROOT}" != "true" ]
+		then
+			# Creating mountpoint
+			mkdir -p chroot/proc
+
+			# Mounting /proc
+			${LH_ROOT_COMMAND} mount proc-live -t proc chroot/proc
+		else
+			rm -rf chroot/proc
+			ln -s /proc chroot/
+		fi
+
+		# Creating stage file
+		Create_stagefile .stage/chroot_proc
+		;;
+
+	remove)
+		Echo_message "Begin unmounting /proc..."
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		if [ "${LH_USE_FAKEROOT}" != "true" ]
+		then
+			# Workaround binfmt-support /proc locking
+			if [ -e chroot/proc/sys/fs/binfmt_misc/status ]
+			then
+				${LH_ROOT_COMMAND} umount chroot/proc/sys/fs/binfmt_misc
+			fi
+
+			# Unmounting /proc
+			#fuser -km chroot/proc
+			if [ -e chroot/proc/version ]
+			then
+				${LH_ROOT_COMMAND} umount chroot/proc
+			fi
+		else
+			rm -rf chroot/proc
+			mkdir -p chroot/proc
+		fi
+
+		# Removing stage file
+		rm -f .stage/chroot_proc
+		;;
+
+	*)
+		Usage
+		;;
+esac
diff --git a/scripts/build/chroot_resolv b/scripts/build/chroot_resolv
new file mode 100755
index 0000000..d8b553c
--- /dev/null
+++ b/scripts/build/chroot_resolv
@@ -0,0 +1,95 @@
+#!/bin/sh
+
+# lh_chroot_resolv(1) - manage /etc/resolv.conf
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'manage /etc/resolv.conf')"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+case "${1}" in
+	install)
+		Echo_message "Configuring file /etc/resolv.conf"
+
+		# Checking stage file
+		Check_stagefile .stage/chroot_resolv
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		if [ -e chroot/etc/resolv.conf ]
+		then
+			# Save resolv file or symlink
+			mv chroot/etc/resolv.conf chroot/etc/resolv.conf.orig
+
+			# Also truncate it, otherwise we'll end up with the one
+			# created by debootstrap in the final image.
+			#
+			# If you want to have a custom resolv.conf, please
+			# overwrite it with normal local_includes mechanism.
+			Truncate chroot/etc/resolv.conf.orig
+		fi
+
+		if [ -f /etc/resolv.conf ]
+		then
+			# Copy resolv file
+			cp /etc/resolv.conf chroot/etc/resolv.conf
+		fi
+
+		# Creating stage file
+		Create_stagefile .stage/chroot_resolv
+		;;
+
+	remove)
+		Echo_message "Deconfiguring file /etc/resolv.conf"
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		if [ -e config/chroot_local-includes/etc/resolv.conf ]
+		then
+			# Copying local resolv.conf
+			cp -a config/chroot_local-includes/etc/resolv.conf chroot/etc/resolv.conf
+			rm -f chroot/etc/resolv.conf.orig
+		elif [ -e chroot/etc/resolv.conf.orig ]
+		then
+			# Restoring resolv file or symlink
+			mv chroot/etc/resolv.conf.orig chroot/etc/resolv.conf
+		else
+			# Truncating resolv file
+			Truncate chroot/etc/resolv.conf
+		fi
+
+		# Removing stage file
+		rm -f .stage/chroot_resolv
+		;;
+
+	*)
+		Usage
+		;;
+esac
diff --git a/scripts/build/chroot_selinuxfs b/scripts/build/chroot_selinuxfs
new file mode 100755
index 0000000..23523d2
--- /dev/null
+++ b/scripts/build/chroot_selinuxfs
@@ -0,0 +1,96 @@
+#!/bin/sh
+
+# lh_chroot_sysfs(1) - mount /selinux
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'mount /selinux')"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Ensure that a system is built as root
+lh testroot
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+case "${1}" in
+	install)
+		if [ -e /selinux/enforce ] && [ "$(cat /selinux/enforce)" = "1" ]
+		then
+			Echo_message "Begin mounting /selinux..."
+
+			# Checking stage file
+			Check_stagefile .stage/chroot_selinuxfs
+
+			# Checking lock file
+			Check_lockfile .lock
+
+			# Creating lock file
+			Create_lockfile .lock
+
+			if [ "${LH_USE_FAKEROOT}" != "true" ]
+			then
+				# Create mountpoint
+				mkdir -p chroot/selinux
+
+				# Mounting /selinux
+				${LH_ROOT_COMMAND} mount selinuxfs-live -t selinuxfs chroot/selinux
+			else
+				rm -rf chroot/selinux
+				ln -s /selinux chroot/
+			fi
+
+			# Creating stage file
+			Create_stagefile .stage/chroot_selinuxfs
+		fi
+		;;
+
+	remove)
+		Echo_message "Begin unmounting /selinux..."
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		if [ "${LH_USE_FAKEROOT}" != "true" ]
+		then
+			# Unmounting /selinux
+			#fuser -km chroot/selinux
+			if [ -e chroot/selinux/enforce ]
+			then
+				${LH_ROOT_COMMAND} umount chroot/selinux
+			fi
+		else
+			if [ -e chroot/selinux ]
+			then
+				rm -rf chroot/selinux
+				mkdir -p chroot/selinux
+			fi
+		fi
+
+		# Removing stage file
+		rm -f .stage/chroot_selinux
+		;;
+
+	*)
+		Usage
+		;;
+esac
diff --git a/scripts/build/chroot_sources b/scripts/build/chroot_sources
new file mode 100755
index 0000000..f18cb6b
--- /dev/null
+++ b/scripts/build/chroot_sources
@@ -0,0 +1,608 @@
+#!/bin/sh
+
+# lh_chroot_sources(1) - manage /etc/apt/sources.list
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'manage /etc/apt/sources.list')"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+_LH_LOCAL_KEY_EMAIL="live-helper-local-key at invalid"
+
+case "${1}" in
+	install)
+		Echo_message "Configuring file /etc/apt/sources.list"
+
+		# Checking stage file
+		Check_stagefile .stage/chroot_sources
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		# Restoring cache
+		Restore_cache cache/packages_chroot
+
+		# Configure custom sources.list
+		echo "deb ${LH_MIRROR_CHROOT} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" > chroot/etc/apt/sources.list
+
+		if [ "${LH_SOURCE}" = "true" ]
+		then
+			echo "deb-src ${LH_MIRROR_CHROOT} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+		fi
+
+		if [ "${LH_SECURITY}" = "true" ]
+		then
+			case "${LH_MODE}" in
+				ubuntu)
+					echo "deb ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+					if [ "${LH_SOURCE}" = "true" ]
+					then
+						echo "deb-src ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+					fi
+					;;
+
+				*)
+					if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
+					then
+						echo "deb ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+						if [ "${LH_SOURCE}" = "true" ]
+						then
+							echo "deb-src ${LH_MIRROR_CHROOT_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+						fi
+					fi
+					;;
+			esac
+		fi
+
+		if [ "${LH_VOLATILE}" = "true" ]
+		then
+			case "${LH_MODE}" in
+				debian|debian-release)
+					if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
+					then
+						echo "deb ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+						if [ "${LH_SOURCE}" = "true" ]
+						then
+							echo "deb-src ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+						fi
+					fi
+					;;
+
+				ubuntu)
+					echo "deb ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}-updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+					if [ "${LH_SOURCE}" = "true" ]
+					then
+						echo "deb-src ${LH_MIRROR_CHROOT_VOLATILE} ${LH_DISTRIBUTION}-updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+					fi
+					;;
+			esac
+		fi
+
+		# Check local sources.list
+		if Find_files config/chroot_sources/*.chroot
+		then
+			# Deconfigure (possibly) old sources.list snipplets
+			if Find_files config/chroot_sources/*.binary
+			then
+				for FILE in config/chroot_sources/*.binary
+				do
+					rm -f "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary).list"
+				done
+			fi
+
+			# Configure new sources.list snipplets
+			for FILE in config/chroot_sources/*.chroot
+			do
+				cp "${FILE}" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot).list"
+			done
+		fi
+
+		# Configure third-party repositories
+		if [ -n "${LH_REPOSITORIES}" ]
+		then
+			for REPOSITORY in ${LH_REPOSITORIES}
+			do
+				for PLACE in config/repositories "${LH_BASE}/repositories"
+				do
+					# Prefer repositories from the config tree
+					# over the global ones.
+					if ! ls "${PLACE}/${REPOSITORY}"* > /dev/null 2>&1
+					then
+						continue
+					fi
+
+					# Adding sources.list entries (chroot)
+					if [ -e "${PLACE}/${REPOSITORY}.chroot" ]
+					then
+						sed -e "s|@DISTRIBUTION@|${LH_DISTRIBUTION}|g" \
+						    -e "s|@ARCHIVE_AREAS@|${LH_ARCHIVE_AREAS}|g" \
+						"${PLACE}/${REPOSITORY}.chroot" > \
+						"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
+					elif [ -e "${PLACE}/${REPOSITORY}" ]
+					then
+						sed -e "s|@DISTRIBUTION@|${LH_DISTRIBUTION}|g" \
+						    -e "s|@ARCHIVE_AREAS@|${LH_ARCHIVE_AREAS}|g" \
+						"${PLACE}/${REPOSITORY}" > \
+						"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
+					fi
+
+					if [ "${LH_APT_SECURE}" != false ]
+					then
+						# Adding archive signing keys (chroot)
+						if [ -e "${PLACE}/${REPOSITORY}.chroot.gpg" ]
+						then
+							cat "${PLACE}/${REPOSITORY}.chroot.gpg" | Chroot chroot "apt-key add -"
+						elif [ -e "${PLACE}/${REPOSITORY}.gpg" ]
+						then
+							cat "${PLACE}/${REPOSITORY}.gpg" | Chroot chroot "apt-key add -"
+						fi
+					fi
+				done
+			done
+		fi
+
+		# Configure local package repository
+		if Find_files config/chroot_local-packages/*.deb
+		then
+			rm -rf chroot/root/local-packages
+			mkdir -p chroot/root/local-packages
+
+			if [ "$(stat --printf %d config/chroot_local-packages)" = "$(stat --printf %d chroot/root/local-packages)" ]
+			then
+				CP_OPTIONS="-l"
+			fi
+
+			# Copy packages
+			if Find_files config/chroot_local-packages/*_"${LH_ARCHITECTURE}".deb
+			then
+				cp ${CP_OPTIONS} config/chroot_local-packages/*_"${LH_ARCHITECTURE}".deb chroot/root/local-packages
+			fi
+
+			if Find_files config/chroot_local-packages/*_all.deb
+			then
+				cp ${CP_OPTIONS} config/chroot_local-packages/*_all.deb chroot/root/local-packages
+			fi
+
+			if Find_files chroot/root/local-packages/*.deb
+			then
+				# If we bootstrapped a minimal chroot, we need
+				# to install apt-utils before we have have
+				# completed all the indices.
+				case "${LH_PACKAGES_LISTS}" in
+					stripped|minimal)
+						Chroot chroot "apt-get update"
+						;;
+				esac
+
+				# Check depends
+				Check_package chroot/usr/bin/apt-ftparchive apt-utils
+
+				# Installing depends
+				Install_package
+
+				# Generate Packages and Packages.gz 
+				echo "cd /root/local-packages && apt-ftparchive packages . > Packages" | Chroot chroot sh
+				gzip -9 -c chroot/root/local-packages/Packages > chroot/root/local-packages/Packages.gz
+
+				# Generate Release
+				echo "cd /root/local-packages && apt-ftparchive \
+					-o APT::FTPArchive::Release::Origin=chroot_local-packages \
+					release . > Release" | Chroot chroot sh
+
+				if [ "${LH_APT_SECURE}" = "true" ]
+				then
+					_LH_DOTGNUPG_EXISTED=0
+					if [ -d chroot/root/.gnupg ]
+					then
+						_LH_DOTGNUPG_EXISTED=1
+					fi
+
+					# Ensure ~/.gnupg exists (required for gnupg >= ~1.4.9)
+					mkdir -p chroot/root/.gnupg
+
+					# Temporarily replace /dev/random with /dev/urandom so as not
+					# to block automated image builds; we don't care about the
+					# security of this key anyway.
+					mv chroot/dev/random chroot/dev/random.orig
+					cp -a chroot/dev/urandom chroot/dev/random
+
+					if Find_files cache/local-package-keyring.*
+					then
+						cp cache/local-package-keyring.* chroot/root
+					else
+						# Generate temporary key
+						echo "Key-Type: RSA
+						      Key-Length: 1024
+						      Subkey-Type: ELG-E
+						      Subkey-Length: 1024
+						      Name-Real: live-helper local packages key
+						      Name-Email: ${_LH_LOCAL_KEY_EMAIL}
+						      Expire-Date: 0
+						      %secring /root/local-package-keyring.sec
+						      %pubring /root/local-package-keyring.pub
+						      %commit" | Chroot chroot "gpg --batch --gen-key" || _LH_RET=${?}
+
+						case "${_LH_RET}" in
+							""|2)
+								# Gnupg sometimes seems to return with a status of 2 when there was not
+								# enough entropy (and key creation blocks temporarily) even if the
+								# operation was ultimately successful.
+								;;
+							*)
+								Echo_error "GPG exited with error status %s" "${_LH_RET}"
+								exit ${_LH_RET}
+								;;
+						esac
+
+						# Save keyrings to avoid regeneration
+						cp chroot/root/local-package-keyring.* cache/
+					fi
+
+					# Sign release
+					Chroot chroot "gpg --no-default-keyring --secret-keyring /root/local-package-keyring.sec \
+						--keyring /root/local-package-keyring.pub -abs -o \
+						/root/local-packages/Release.gpg /root/local-packages/Release"
+
+					# Import key
+					Chroot chroot "gpg --no-default-keyring --secret-keyring /root/local-package-keyring.sec \
+						--keyring /root/local-package-keyring.pub --armor \
+						--export ${_LH_LOCAL_KEY_EMAIL}" | Chroot chroot "apt-key add -"
+
+					# Remove temporary keyrings
+					rm chroot/root/local-package-keyring.pub
+					rm chroot/root/local-package-keyring.sec
+
+					# Revert /dev/random
+					mv chroot/dev/random.orig chroot/dev/random
+
+					# Remove /root/.gnupg if we created it during the signing process
+					if [ "${_LH_DOTGNUPG_EXISTED}" -eq 0 ]
+					then
+						rm -rf chroot/root/.gnupg
+					fi
+				fi
+
+				# Add to sources.list.d
+				echo "deb file:/root/local-packages ./" > chroot/etc/apt/sources.list.d/local-packages.list
+
+				# Removing depends
+				Remove_package
+			else
+				Echo_warning "Local packages must be named with suffix '_all.deb' or '_\$architecture.deb'."
+			fi
+		fi
+
+		# Update indices from cache
+		if [ "${LH_CACHE_INDICES}" = "true" ] && [ -d cache/indices_bootstrap ]
+		then
+			if Find_files cache/indices_bootstrap/secring.gpg*
+			then
+				cp -f cache/indices_bootstrap/secring.gpg* chroot/etc/apt
+			fi
+
+			if Find_files cache/indices_bootstrap/trusted.gpg*
+			then
+				cp -rf cache/indices_bootstrap/trusted.gpg* chroot/etc/apt
+			fi
+
+			if [ -f cache/indices_bootstrap/pkgcache.bin ]
+			then
+				cp -f cache/indices_bootstrap/pkgcache.bin chroot/var/cache/apt
+			fi
+
+			if [ -f cache/indices_bootstrap/srcpkgcache.bin ]
+			then
+				cp -f cache/indices_bootstrap/srcpkgcache.bin chroot/var/cache/apt
+			fi
+
+			if Find_files cache/indices_bootstrap/*_Packages
+			then
+				cp -f cache/indices_bootstrap/*_Packages chroot/var/lib/apt/lists
+			fi
+
+			if Find_files cache/indices_bootstrap/*_Sources
+			then
+				cp -f cache/indices_bootstrap/*_Sources chroot/var/lib/apt/lists
+			fi
+
+			if Find_files cache/indices_bootstrap/*_Release*
+			then
+				cp -f cache/indices_bootstrap/*_Release* chroot/var/lib/apt/lists
+			fi
+
+			if [ "${LH_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ]
+			then
+				Chroot chroot "apt-get ${APT_OPTIONS} install aptitude"
+			fi
+		else # Get fresh indices
+			# Check local gpg keys
+			if Find_files config/chroot_sources/*.chroot.gpg
+			then
+				for FILE in config/chroot_sources/*.chroot.gpg
+				do
+					cp ${FILE} chroot/root
+					Chroot chroot "apt-key add /root/$(basename ${FILE})"
+					rm -f chroot/root/$(basename ${FILE})
+				done
+			fi
+
+			# Check local keyring packages
+			if Find_files config/chroot_sources/*.deb
+			then
+				for PACKAGE in config/chroot_sources/*.deb
+				do
+					cp ${PACKAGE} chroot/root
+					Chroot chroot "dpkg -i /root/$(basename ${PACKAGE})"
+					rm -f chroot/root/$(basename ${PACKAGE})
+				done
+			fi
+
+			# Installing aptitude
+			if [ "${LH_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ]
+			then
+				Chroot chroot "apt-get ${APT_OPTIONS} update"
+				Chroot chroot "apt-get ${APT_OPTIONS} install aptitude"
+			fi
+
+			Apt update
+			Apt upgrade
+			Apt dist-upgrade
+
+			# Installing keyring packages
+			if [ -n "${LH_KEYRING_PACKAGES}" ]
+			then
+				Chroot chroot "apt-get --yes --force-yes install ${LH_KEYRING_PACKAGES}"
+				Apt update
+			fi
+
+			if [ "${LH_CACHE_INDICES}" = "true" ]
+			then
+				mkdir -p cache/indices_bootstrap
+
+				cp -f chroot/etc/apt/secring.gpg* cache/indices_bootstrap
+				cp -rf chroot/etc/apt/trusted.gpg* cache/indices_bootstrap
+
+				cp -f chroot/var/cache/apt/pkgcache.bin cache/indices_bootstrap
+
+				if Find_files chroot/var/cache/apt/srcpkgcache.bin
+				then
+					cp -f chroot/var/cache/apt/srcpkgcache.bin cache/indices_bootstrap
+				fi
+
+				cp -f chroot/var/lib/apt/lists/*_Packages cache/indices_bootstrap
+
+				if Find_files chroot/var/lib/apt/lists/*_Sources
+				then
+					cp -f chroot/var/lib/apt/lists/*_Sources cache/indices_bootstrap
+				fi
+
+				cp -f chroot/var/lib/apt/lists/*_Release* cache/indices_bootstrap
+			fi
+		fi
+
+		# Saving cache
+		Save_cache cache/packages_chroot
+
+		# Creating stage file
+		Create_stagefile .stage/chroot_sources
+		;;
+
+	remove)
+		Echo_message "Deconfiguring file /etc/apt/sources.list"
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		# Configure generic indices
+		# Don't do anything if it's not required
+		if [ "${LH_MIRROR_CHROOT}" = "${LH_MIRROR_BINARY}" ] && \
+		[ "${LH_MIRROR_CHROOT_SECURITY}" = "${LH_MIRROR_BINARY_SECURITY}" ] && \
+		[ ! -d chroot/root/local-packages ]
+		then
+			# Removing stage file
+			rm -f .stage/chroot_sources
+
+			exit 0
+		fi
+
+		# Cleaning apt list cache
+		rm -rf chroot/var/lib/apt/lists
+		mkdir -p chroot/var/lib/apt/lists/partial
+
+		echo "deb ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" > chroot/etc/apt/sources.list
+
+		if [ "${LH_SOURCE}" = "true" ]
+		then
+			echo "deb-src ${LH_MIRROR_BINARY} ${LH_DISTRIBUTION} ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+		fi
+
+		if [ "${LH_SECURITY}" = "true" ]
+		then
+			case "${LH_MODE}" in
+				ubuntu)
+					echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+					if [ "${LH_SOURCE}" = "true" ]
+					then
+						echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}-security ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+					fi
+					;;
+
+				*)
+					if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
+					then
+						echo "deb ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+						if [ "${LH_SOURCE}" = "true" ]
+						then
+							echo "deb-src ${LH_MIRROR_BINARY_SECURITY} ${LH_DISTRIBUTION}/updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+						fi
+					fi
+					;;
+			esac
+		fi
+
+		if [ "${LH_VOLATILE}" = "true" ]
+		then
+			case "${LH_MODE}" in
+				debian|debian-release)
+					if [ "${LH_DISTRIBUTION}" != "sid" ] && [ "${LH_DISTRIBUTION}" != "unstable" ]
+					then
+						echo "deb ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+						if [ "${LH_SOURCE}" = "true" ]
+						then
+							echo "deb-src ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}/volatile ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+						fi
+					fi
+					;;
+
+				ubuntu)
+					echo "deb ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}-updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+
+					if [ "${LH_SOURCE}" = "true" ]
+					then
+						echo "deb-src ${LH_MIRROR_BINARY_VOLATILE} ${LH_DISTRIBUTION}-updates ${LH_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list
+					fi
+					;;
+			esac
+		fi
+
+		# Configure third-party repositories
+		if [ -n "${LH_REPOSITORIES}" ]
+		then
+			for REPOSITORY in ${LH_REPOSITORIES}
+			do
+				# Removing sources.list entries (chroot)
+				rm -f "chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
+
+				for PLACE in config/repositories "${LH_BASE}/repositories"
+				do
+					# Prefer repositories from the config tree
+					# over the global ones.
+					if ! ls "${PLACE}/${REPOSITORY}"* > /dev/null 2>&1
+					then
+						continue
+					fi
+
+					# Adding sources.list entries (binary)
+					if [ -e "${PLACE}/${REPOSITORY}.binary" ]
+					then
+						sed -e "s|@DISTRIBUTION@|${LH_DISTRIBUTION}|g" \
+						    -e "s|@ARCHIVE_AREAS@|${LH_ARCHIVE_AREAS}|g" \
+						"${PLACE}/${REPOSITORY}.binary" > \
+						"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
+					elif [ -e "${PLACE}/${REPOSITORY}" ]
+					then
+						sed -e "s|@DISTRIBUTION@|${LH_DISTRIBUTION}|g" \
+						    -e "s|@ARCHIVE_AREAS@|${LH_ARCHIVE_AREAS}|g" \
+						"${PLACE}/${REPOSITORY}" > \
+						"chroot/etc/apt/sources.list.d/${REPOSITORY}.list"
+					fi
+
+					if [ "${LH_APT_SECURE}" != false ]
+					then
+						# Adding archive signing keys (binary)
+						if [ -e "${PLACE}/${REPOSITORY}.binary.gpg" ]
+						then
+							cat "${PLACE}/${REPOSITORY}.binary.gpg" | Chroot chroot "apt-key add -"
+						elif [ -e "${PLACE}/${REPOSITORY}.gpg" ]
+						then
+							cat "${PLACE}/${REPOSITORY}.gpg" | Chroot chroot "apt-key add -"
+						fi
+					fi
+				done
+			done
+		fi
+
+		# Check local sources.list
+		if Find_files config/chroot_sources/*.binary
+		then
+			# Deconfigure (possibly) old sources.list snipplets
+			if Find_files config/chroot_sources/*.chroot
+			then
+			for FILE in config/chroot_sources/*.chroot
+				do
+					rm -f "chroot/etc/apt/sources.list.d/$(basename ${FILE} .chroot).list"
+				done
+			fi
+
+			# Configure new sources.list snipplets
+			for FILE in config/chroot_sources/*.binary
+			do
+				cp "${FILE}" "chroot/etc/apt/sources.list.d/$(basename ${FILE} .binary).list"
+			done
+		fi
+
+		# Check local gpg keys
+		if Find_files config/chroot_sources/*.binary.gpg
+		then
+			for FILE in config/chroot_sources/*.binary.gpg
+			do
+				cp ${FILE} chroot/root
+				Chroot chroot "apt-key add /root/$(basename ${FILE})"
+				rm -f chroot/root/$(basename ${FILE})
+			done
+		fi
+
+		# Updating indices
+		Apt update
+
+		# Cleaning apt package cache
+		rm -rf chroot/var/cache/apt
+		mkdir -p chroot/var/cache/apt/archives/partial
+
+		# Cleaning apt package lists
+		if [ "${LH_BINARY_INDICES}" = "false" ]
+		then
+			rm -rf chroot/var/lib/apt/lists
+			mkdir -p chroot/var/lib/apt/lists/partial
+		fi
+
+		# Remove local package repository
+		rm -f chroot/etc/apt/sources.list.d/local-packages.list
+		rm -rf chroot/root/local-packages
+
+		# Remove local packages key if it exists
+		if apt-key list | grep -q ${_LH_LOCAL_KEY_EMAIL}
+		then
+			apt-key del ${_LH_LOCAL_KEY_EMAIL}
+		fi
+
+		# Removing stage file
+		rm -f .stage/chroot_sources
+		;;
+
+	*)
+		Usage
+		;;
+esac
diff --git a/scripts/build/chroot_symlinks b/scripts/build/chroot_symlinks
new file mode 100755
index 0000000..c256780
--- /dev/null
+++ b/scripts/build/chroot_symlinks
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# lh_chroot_symlinks(1) - convert symlinks
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'convert symlinks')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_SYMLINKS}" != "true" ]
+then
+	exit 0
+fi
+
+Echo_message "Begin converting symlinks..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_symlinks
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Checking depends
+Check_package chroot/usr/bin/symlinks symlinks
+
+# Installing depends
+Install_package
+
+# Converting symlinks
+Chroot chroot "symlinks -c -r -s /"
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/chroot_symlinks
diff --git a/scripts/build/chroot_sysfs b/scripts/build/chroot_sysfs
new file mode 100755
index 0000000..8578841
--- /dev/null
+++ b/scripts/build/chroot_sysfs
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# lh_chroot_sysfs(1) - mount /sys
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'mount /sys')"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Ensure that a system is built as root
+lh testroot
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+case "${1}" in
+	install)
+		Echo_message "Begin mounting /sys..."
+
+		# Checking stage file
+		Check_stagefile .stage/chroot_sysfs
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		if [ "${LH_USE_FAKEROOT}" != "true" ]
+		then
+			# Create mountpoint
+			mkdir -p chroot/sys
+
+			# Mounting /sys
+			${LH_ROOT_COMMAND} mount sysfs-live -t sysfs chroot/sys
+		else
+			rm -rf chroot/sys
+			ln -s /sys chroot/
+		fi
+
+		# Creating stage file
+		Create_stagefile .stage/chroot_sysfs
+		;;
+
+	remove)
+		Echo_message "Begin unmounting /sys..."
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		if [ "${LH_USE_FAKEROOT}" != "true" ]
+		then
+			# Unmounting /sys
+			#fuser -km chroot/sys
+			if [ -e chroot/sys/class ]
+			then
+				${LH_ROOT_COMMAND} umount chroot/sys
+			fi
+		else
+			rm -rf chroot/sys
+			mkdir -p chroot/sys
+		fi
+
+		# Removing stage file
+		rm -f .stage/chroot_sysfs
+		;;
+
+	*)
+		Usage
+		;;
+esac
diff --git a/scripts/build/chroot_sysv-rc b/scripts/build/chroot_sysv-rc
new file mode 100755
index 0000000..2154ff4
--- /dev/null
+++ b/scripts/build/chroot_sysv-rc
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# lh_chroot_sysv-rc(1) - manage /usr/sbin/policy-rc.d
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'manage /usr/sbin/policy-rc.d')"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+case "${1}" in
+	install)
+		Echo_message "Configuring file /usr/sbin/policy-rc.d"
+
+		# Checking stage file
+		Check_stagefile .stage/chroot_sysv-rc
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		if [ -f chroot/usr/sbin/policy-rc.d ]
+		then
+			# Save policy-rc.d file
+			mv chroot/usr/sbin/policy-rc.d chroot/usr/sbin/policy-rc.d.orig
+		fi
+
+		# Create policy-rc.d file
+cat > chroot/usr/sbin/policy-rc.d << EOF
+#!/bin/sh
+echo "All runlevel operations denied by policy" >&2
+exit 101
+EOF
+
+		chmod 0755 chroot/usr/sbin/policy-rc.d
+
+		# Creating stage file
+		Create_stagefile .stage/chroot_sysv-rc
+		;;
+
+	remove)
+		Echo_message "Deconfiguring file /usr/sbin/policy-rc.d"
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		if [ -f chroot/usr/sbin/policy-rc.d.orig ]
+		then
+			# Restore policy-rc.d file
+			mv chroot/usr/sbin/policy-rc.d.orig chroot/usr/sbin/policy-rc.d
+		else
+			# Remove policy-rc.d file
+			rm -f chroot/usr/sbin/policy-rc.d
+		fi
+
+		# Removing stage file
+		rm -f .stage/chroot_sysv-rc
+		;;
+
+	*)
+		Usage
+		;;
+esac
diff --git a/scripts/build/chroot_sysvinit b/scripts/build/chroot_sysvinit
new file mode 100755
index 0000000..7178ce9
--- /dev/null
+++ b/scripts/build/chroot_sysvinit
@@ -0,0 +1,60 @@
+#!/bin/sh
+
+# lh_chroot_sysvinit(1) - configure sysvinit
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'configure sysvinit')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Configuring package sysvinit"
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_sysvinit
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LH_SYSVINIT}" = "true" ]
+then
+	# Disable all
+	for FILE in chroot/etc/init.d/*
+	do
+		Chroot chroot "update-rc.d -f $(basename ${FILE}) remove"
+	done
+
+	# Re-enable all required (taken from -f standard chroot)
+	for PACKAGE in ${LH_INITRAMFS} console-common cron dpkg ifupdown initscripts kbd klogd libc6 libdevmapper1.02 libselinux1 libsepol1 login makedev module-init-tools netbase openbsd-inetd procps sudo sysklogd udev util-linux
+	do
+		if [ -f chroot/var/lib/dpkg/info/${PACKAGE}.postinst ]
+		then
+			# Re-configure if existing
+			Chroot chroot "/var/lib/dpkg/info/${PACKAGE}.postinst configure"
+		fi
+	done
+
+	# Creating stage file
+	Create_stagefile .stage/chroot_sysvinit
+fi
diff --git a/scripts/build/chroot_tasks b/scripts/build/chroot_tasks
new file mode 100755
index 0000000..6c7d274
--- /dev/null
+++ b/scripts/build/chroot_tasks
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+# lh_chroot_tasks(1) - install tasks into chroot
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'install tasks into chroot')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin installing tasks..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/chroot_tasks
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ -n "${LH_TASKS}" ] && [ "${LH_TASKS}" != "none" ]
+then
+	# Restoring cache
+	Restore_cache cache/packages_chroot
+
+	# Checking depends
+	case "${LH_TASKSEL}" in
+		aptitude)
+			Check_package chroot/usr/bin/aptitude aptitude
+			;;
+
+		tasksel)
+			Check_package chroot/usr/bin/tasksel tasksel
+			;;
+	esac
+
+	# Installing depends
+	Install_package
+
+	# Installing tasks
+	case "${LH_TASKSEL}" in
+		aptitude)
+			Chroot chroot "aptitude ${APTITUDE_OPTIONS} install ${LH_TASKS}"
+			;;
+
+		tasksel)
+			for TASK in ${LH_TASKS}
+			do
+				Chroot chroot "tasksel --debconf-apt-progress --logstderr install ${TASK}"
+			done
+			;;
+	esac
+
+	# Removing depends
+	Remove_package
+
+	# Saving cache
+	Save_cache cache/packages_chroot
+
+	# Creating stage file
+	Create_stagefile .stage/chroot_tasks
+fi
diff --git a/scripts/build/chroot_upstart b/scripts/build/chroot_upstart
new file mode 100755
index 0000000..c80bf86
--- /dev/null
+++ b/scripts/build/chroot_upstart
@@ -0,0 +1,86 @@
+#!/bin/sh
+
+# lh_chroot_upstart(1) - manage /usr/sbin/initctl
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'manage /usr/sbin/initctl')"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+case "${1}" in
+	install)
+		Echo_message "Configuring file /usr/sbin/initctl"
+
+		# Checking stage file
+		Check_stagefile .stage/chroot_upstart
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		if [ -f chroot/usr/sbin/initctl ]
+		then
+			# Save initctl file
+			mv chroot/usr/sbin/initctl chroot/usr/sbin/initctl.orig
+		fi
+
+		# Create initctl file
+cat > chroot/usr/sbin/initctl << EOF
+#!/bin/sh
+echo "All runlevel operations denied by policy" >&2
+exit 101
+EOF
+
+		chmod 0755 chroot/usr/sbin/initctl
+
+		# Creating stage file
+		Create_stagefile .stage/chroot_upstart
+		;;
+
+	remove)
+		Echo_message "Deconfiguring file /usr/sbin/initctl"
+
+		# Checking lock file
+		Check_lockfile .lock
+
+		# Creating lock file
+		Create_lockfile .lock
+
+		if [ -f chroot/usr/sbin/initctl.orig ]
+		then
+			# Restore initctl file
+			mv chroot/usr/sbin/initctl.orig chroot/usr/sbin/initctl
+		else
+			# Remove initctl file
+			rm -f chroot/usr/sbin/initctl
+		fi
+
+		# Removing stage file
+		rm -f .stage/chroot_upstart
+		;;
+
+	*)
+		Usage
+		;;
+esac
diff --git a/scripts/build/clean b/scripts/build/clean
new file mode 100755
index 0000000..2df040c
--- /dev/null
+++ b/scripts/build/clean
@@ -0,0 +1,155 @@
+#!/bin/sh
+
+# lh_clean(1) - clean up system build directories
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Read meta config
+if [ "${1}" != "noauto" ] && [ -x auto/clean ]
+then
+	Echo_message "Executing auto/clean script."
+	./auto/clean ${@}
+fi
+
+if [ "${1}" = "noauto" ]
+then
+	shift
+fi
+
+# Setting static variables
+DESCRIPTION="$(Echo 'clean up system build directories')"
+HELP=""
+USAGE="${PROGRAM} [--all] [--cache] [--chroot] [--binary] [--purge] [--remove] [--stage] [--source]"
+
+#Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Avoid cases were users accidentally nuke their config/binary
+if [ ! -d config ] && [ "$(basename ${PWD})" = "config" ]
+then
+	Echo_error "%s is not a good Debian Live working directory to clean." "${PWD}"
+	exit 1
+fi
+
+rm -f .lock
+
+if [ -z "${*}" ]
+then
+	ARGUMENTS="--all"
+else
+	ARGUMENTS="${@}"
+fi
+
+for ARGUMENT in ${ARGUMENTS}
+do
+	case "${ARGUMENT}" in
+		--all)
+			LH=1 "${0}" noauto --chroot
+			LH=1 "${0}" noauto --binary
+			LH=1 "${0}" noauto --stage
+			LH=1 "${0}" noauto --source
+
+			if [ -d auto ]
+			then
+				rmdir --ignore-fail-on-non-empty auto
+			fi
+			;;
+
+		--cache)
+			${LH_ROOT_COMMAND} rm -rf cache
+			;;
+
+		--chroot)
+			Echo_message "Cleaning chroot"
+			${LH_ROOT_COMMAND} umount -f chroot/sys > /dev/null 2>&1 || true
+			${LH_ROOT_COMMAND} umount -f chroot/proc/sys/fs/binfmt_misc > /dev/null 2>&1 || true
+			${LH_ROOT_COMMAND} umount -f chroot/proc > /dev/null 2>&1 || true
+			${LH_ROOT_COMMAND} umount -f chroot/lib/init/rw > /dev/null 2>&1 || true
+			${LH_ROOT_COMMAND} umount -f chroot/dev/shm > /dev/null 2>&1 || true
+			${LH_ROOT_COMMAND} umount -f chroot/dev/pts > /dev/null 2>&1 || true
+			${LH_ROOT_COMMAND} umount -f chroot/dev > /dev/null 2>&1 || true
+
+			${LH_ROOT_COMMAND} umount -f chroot/binary.tmp > /dev/null 2>&1 || true
+			${LH_ROOT_COMMAND} umount -f chroot/dev.tmp/pts > /dev/null 2>&1 || true
+
+			${LH_ROOT_COMMAND} rm -rf chroot chroot.tmp
+
+			rm -f .stage/chroot*
+			;;
+
+		--binary)
+			${LH_ROOT_COMMAND} umount -f binary.tmp > /dev/null 2>&1 || true
+			rm -rf binary.tmp binary.deb binary.udeb
+			rm -f binary*.iso
+			rm -f binary*.img
+			rm -f binary*.tar.gz
+			rm -f binary.sh
+			rm -f binary.list binary.packages md5sum.txt
+
+			rm -rf binary
+			rm -rf tftpboot
+
+			rm -f .stage/binary*
+			;;
+
+		--remove)
+			LH=1 "${0}" --all
+			rm -rf cache/packages_*
+			;;
+
+		--purge)
+			LH=1 "${0}" --all
+			LH=1 "${0}" --cache
+
+			if [ -e auto/config ]
+			then
+				rm -f .stage/config
+			fi
+			;;
+
+		--stage)
+			rm -rf .stage
+			;;
+
+		--source)
+			rm -f source*.iso
+			rm -f source*.img
+			rm -f source*.tar
+			rm -f source*.tar.gz
+			rm -f source.list
+			rm -f source-selection.txt
+
+			rm -rf source
+
+			rm -f .stage/source*
+			;;
+
+		-h|--help)
+			Help
+			;;
+
+		-u|--usage)
+			Usage
+			;;
+
+		-v|--version)
+			Version
+			;;
+
+		*)
+			Usage
+			exit 1
+			;;
+	esac
+done
diff --git a/scripts/build/config b/scripts/build/config
new file mode 100755
index 0000000..f4fe415
--- /dev/null
+++ b/scripts/build/config
@@ -0,0 +1,1358 @@
+#!/bin/sh
+
+# lh_config(1) - create configuration for live-helper(7)
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Read meta config
+if [ "${1}" != "noauto" ] && [ -x auto/config ]
+then
+	Echo_message "Executing auto/config script."
+	./auto/config ${@}
+fi
+
+if [ "${1}" = "noauto" ]
+then
+	shift
+fi
+
+# Setting static variables
+SYSTEM_LH_CONFFILE="/etc/default/live-helper"
+DESCRIPTION="$(Echo 'create configuration for live-helper(7)')"
+USAGE="${PROGRAM} [--apt apt|aptitude]\n\
+\t    [--apt-ftp-proxy URL]\n\
+\t    [--apt-http-proxy URL]\n\
+\t    [--apt-pdiffs true|false]\n\
+\t    [--apt-options OPTION|\"OPTIONS\"]\n\
+\t    [--aptitude-options OPTION|\"OPTIONS\"]\n\
+\t    [--apt-pipeline FIXME]\n\
+\t    [--apt-recommends true|false]\n\
+\t    [--apt-secure true|false]\n\
+\t    [-a|--architecture ARCHITECTURE]\n\
+\t    [-b|--binary-images iso|net|tar|usb-hdd]\n\
+\t    [--binary-filesystem fat16|fat32]\n\
+\t    [--binary-indices true|false|none]\n\
+\t    [--bootappend-install PARAMETER|\"PARAMETERS\"]\n\
+\t    [--bootappend-live PARAMETER|\"PARAMETERS\"]\n\
+\t    [--bootloader grub|syslinux|yaboot]\n\
+\t    [--bootstrap cdebootstrap|cdebootstrap-static|debootstrap|copy]\n\
+\t    [--bootstrap-config FILE]\n\
+\t    [-f|--bootstrap-flavour minimal|standard]\n\
+\t    [--bootstrap-keyring PACKAGE]\n\
+\t    [--breakpoints]\n\
+\t    [--cache true|false]\n\
+\t    [--cache-indices true|false]\n\
+\t    [--cache-packages true|false]\n\
+\t    [--cache-stages STAGE|\"STAGES\"]\n\
+\t    [--checksums md5|sha1|sha256|none]\n\
+\t    [--build-with-chroot true|false]\n\
+\t    [--chroot-filesystem ext2|ext3|squashfs|plain|jffs2]\n\
+\t    [-c|--conffile FILE]\n\
+\t    [--clean\n\
+\t    [--debconf-frontend dialog|editor|noninteractive|readline]\n\
+\t    [--debconf-nowarnings true|false]\n\
+\t    [--debconf-priority low|medium|high|critical]\n\
+\t    [--debian-installer true|cdrom|netinst|netboot|businesscard|live|false]\n\
+\t    [--debian-installer-distribution CODENAME|daily]\n\
+\t    [--debian-installer-preseedfile FILE|URL]\n\
+\t    [--debian-installer-gui true|false]\n\
+\t    [--debug]\n\
+\t    [-d|--distribution CODENAME]\n\
+\t    [--dump]\n\
+\t    [-e|--encryption false|aes128|aes192|aes256]\n\
+\t    [--fdisk fdisk|fdisk.dist]\n\
+\t    [--force]\n\
+\t    [--grub-splash FILE]\n\
+\t    [--gzip-options OPTION|\"OPTIONS\"]\n\
+\t    [--hooks FILE]\n\
+\t    [--hostname NAME]\n\
+\t    [--ignore-system-defaults]\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\
+\t    [--iso-volume NAME]\n\
+\t    [--jffs2-eraseblock SIZE]\n\
+\t    [--keyring-packages PACKAGE|\"PACKAGES\"]\n\
+\t    [-l|--language LANGUAGE]\n\
+\t    [-k|--linux-flavours FLAVOUR|\"FLAVOURS\"]\n\
+\t    [--linux-packages \"PACKAGES\"]\n\
+\t    [--losetup losetup|losetup.orig]\n\
+\t    [--memtest memtest86+|memtest86]\n\
+\t    [-m|--mirror-bootstrap URL]\n\
+\t    [--mirror-chroot URL]\n\
+\t    [--mirror-chroot-security URL]\n\
+\t    [--mirror-chroot-volatile URL]\n\
+\t    [--mirror-binary URL]\n\
+\t    [--mirror-binary-security URL]\n\
+\t    [--mirror-binary-volatile URL]\n\
+\t    [--mirror-debian-installer URL]\n\
+\t    [--mode debian|emdebian]\n\
+\t    [--net-root-filesystem nfs|cfs]\n\
+\t    [--net-root-mountoptions OPTIONS]\n\
+\t    [--net-root-path PATH]\n\
+\t    [--net-root-server IP|HOSTNAME]\n\
+\t    [--net-cow-filesystem nfs|cfs]\n\
+\t    [--net-cow-mountoptions OPTIONS]\n\
+\t    [--net-cow-path PATH]\n\
+\t    [--net-cow-server IP|HOSTNAME]\n\
+\t    [--net-tarball bzip2|gzip|tar|none]\n\
+\t    [-p|--packages-lists FILE]\n\
+\t    [--packages PACKAGE|\"PACKAGES\"]\n\
+\t    [--quiet]\n\
+\t    [-r|--repositories REPOSITORY|\"REPOSITORIES\"]\n\
+\t    [--root-command sudo]\n\
+\t    [--use-fakeroot true|false]\n\
+\t    [--archive-areas ARCHIVE_AREA|\"ARCHIVE_AREAS\"]\n\
+\t    [--security true|false]\n\
+\t    [--source true|false]\n\
+\t    [-s|--source-images iso|net|tar|usb-hdd]\n\
+\t    [--symlinks true|false]\n\
+\t    [--syslinux-splash FILE]\n\
+\t    [--syslinux-timeout SECONDS]\n\
+\t    [--syslinux-menu true|false]\n\
+\t    [--sysvinit true|false]\n\
+\t    [--tasksel aptitude|tasksel]\n\
+\t    [--tasks TASK]\n\
+\t    [--templates PATH]\n\
+\t    [--virtual-root-size MB]\n\
+\t    [--volatile true|false]\n\
+\t    [--exposed-root true|false]\n\
+\t    [--username NAME]\n\
+\t    [--verbose]\n\
+\t    [--win32-loader true|false]"
+
+Local_arguments ()
+{
+	LONG_OPTIONS="apt:,apt-ftp-proxy:,apt-http-proxy:,apt-pdiffs:,apt-options:,aptitute-options:,
+		apt-pipeline:,apt-recommends:,apt-secure:,bootstrap:,cache:,cache-indices:,cache-packages:,
+		cache-stages:,debconf-frontend:,debconf-nowarnings:,debconf-priority:,dump,
+		initramfs:,fdisk:,losetup:,mode:,repositories:,root-command:,use-fakeroot:,tasksel:,includes:,
+		templates:,architecture:,bootstrap-config:,bootstrap-flavour:,bootstrap-keyring:,clean,
+		distribution:,mirror-bootstrap:,mirror-chroot:,mirror-chroot-security:,mirror-chroot-volatile:,mirror-binary:,
+		mirror-binary-security:,mirror-binary-volatile:,mirror-debian-installer:,archive-areas:,chroot-filesystem:,exposed-root:,virtual-root-size:,
+		gzip-options:,hooks:,interactive:,keyring-packages:,language:,linux-flavours:,linux-packages:,
+		packages:,packages-lists:,tasks:,security:,volatile:,symlinks:,sysvinit:,binary-filesystem:,binary-images:,
+		binary-indices:,bootappend-install:,bootappend-live:,bootloader:,checksums:,build-with-chroot:,
+		debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:,debian-installer-gui:,
+		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:,
+		username:,win32-loader:,source:,source-images:,breakpoints,conffile:,debug,force,
+		help,ignore-system-defaults,quiet,usage,verbose,version"
+	# Remove spaces added by indentation
+	LONG_OPTIONS="$(echo ${LONG_OPTIONS} | tr -d ' ')"
+	ARGUMENTS="$(getopt --longoptions ${LONG_OPTIONS} --name=${PROGRAM} --options a:f:d:m:l:k:p:b:e:r:s:c:huv --shell sh -- "${@}")"
+
+	if [ "${?}" != "0" ]
+	then
+		Echo_error "terminating" >&2
+		exit 1
+	fi
+
+	eval set -- "${ARGUMENTS}"
+
+	while true
+	do
+		case "${1}" in
+			--dump)
+				# Dump version
+				if [ -x "$(which dpkg-query 2>/dev/null)" ]
+				then
+					VERSION_DPKG="$(dpkg-query -f='${Version}' --show live-helper)"
+				fi
+
+				Echo "%s: This is live-helper version %s" "${0}" "${VERSION_DPKG:-${VERSION}}"
+
+				# Dump conffile contents
+				Print_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+
+				# Dump contents of directories that contain text files
+				for DIRECTORY in config/binary_local-packageslists config/chroot_local-packageslists config/chroot_apt config/chroot_local-patches config/chroot_local-preseed config/binary_rootfs
+				do
+					if Find_files "${DIRECTORY}"
+					then
+						Echo_file "${DIRECTORY}"/*
+					fi
+				done
+
+				# Dump directory listings of all directories under config/
+				for DIRECTORY in $(find config/ -mindepth 1 -maxdepth 1 -type d)
+				do
+					if Find_files "${DIRECTORY}"
+					then
+						ls -lR "${DIRECTORY}" | while read LINE
+						do
+							echo "${DIRECTORY}: ${LINE}"
+						done
+					fi
+				done
+
+				exit 0
+				;;
+
+			--clean)
+				# Remove empty directories in config tree
+				if ls config/*/ > /dev/null 2>&1
+				then
+					rmdir --ignore-fail-on-non-empty config/*/
+				fi
+
+				if [ -d config ]
+				then
+					rmdir --ignore-fail-on-non-empty config
+				fi
+
+				if [ -d auto/functions ]
+				then
+					rmdir --ignore-fail-on-non-empty auto/functions
+				fi
+
+				if [ -d auto ]
+				then
+					rmdir --ignore-fail-on-non-empty auto
+				fi
+
+				exit 0
+				;;
+
+			# config/common
+			--apt)
+				LH_APT="${2}"
+				shift 2
+				;;
+
+			--apt-ftp-proxy)
+				LH_APT_FTP_PROXY="${2}"
+				shift 2
+				;;
+
+			--apt-http-proxy)
+				LH_APT_HTTP_PROXY="${2}"
+				shift 2
+				;;
+
+			--apt-pdiffs)
+				LH_APT_PDIFFS="${2}"
+				shift 2
+				;;
+			--apt-options)
+				APT_OPTIONS="${2}"
+				shift 2
+				;;
+
+			--aptitude-options)
+				LH_APTITUDE_OPTIONS="${2}"
+				shift 2
+				;;
+
+			--apt-pipeline)
+				LH_APT_PIPELINE="${2}"
+				shift 2
+				;;
+
+			--apt-recommends)
+				LH_APT_RECOMMENDS="${2}"
+				shift 2
+				;;
+
+			--apt-secure)
+				LH_APT_SECURE="${2}"
+				shift 2
+				;;
+
+			--bootstrap)
+				LH_BOOTSTRAP="${2}"
+				shift 2
+				;;
+
+			--cache)
+				LH_CACHE="${2}"
+				shift 2
+				;;
+
+			--cache-indices)
+				LH_CACHE_INDICES="${2}"
+				shift 2
+				;;
+
+			--cache-packages)
+				LH_CACHE_PACKAGES="${2}"
+				shift 2
+				;;
+
+			--cache-stages)
+				LH_CACHE_STAGES="${2}"
+				shift 2
+				;;
+
+			--debconf-frontend)
+				LH_DEBCONF_FRONTEND="${2}"
+				shift 2
+				;;
+
+			--debconf-nowarnings)
+				LH_DEBCONF_NOWARNINGS="${2}"
+				shift 2
+				;;
+
+			--debconf-priority)
+				LH_DEBCONF_PRIORITY="${2}"
+				shift 2
+				;;
+
+			--initramfs)
+				LH_INITRAMFS="${2}"
+				shift 2
+				;;
+
+			--fdisk)
+				LH_FDISK="${2}"
+				shift 2
+				;;
+
+			--losetup)
+				LH_LOSETUP="${2}"
+				shift 2
+				;;
+
+			--mode)
+				LH_MODE="${2}"
+				shift 2
+				;;
+
+			-r|--repositories)
+				LH_REPOSITORIES="${2}"
+				shift 2
+				;;
+
+			--root-command)
+				LH_ROOT_COMMAND="${2}"
+				shift 2
+				;;
+
+			--use-fakeroot)
+				LH_USE_FAKEROOT="${2}"
+				shift 2
+				;;
+
+			--tasksel)
+				LH_TASKSEL="${2}"
+				shift 2
+				;;
+
+			--includes)
+				LH_INCLUDES="${2}"
+				shift 2
+				;;
+
+			--templates)
+				LH_TEMPLATES="${2}"
+				shift 2
+				;;
+
+			-v|--version)
+				Version
+				shift
+				;;
+
+			# config/bootstrap
+			-a|--architecture)
+				LH_ARCHITECTURE="${2}"
+				shift 2
+				;;
+
+			--bootstrap-config)
+				LH_BOOTSTRAP_CONFIG="${2}"
+				shift 2
+				;;
+
+			-f|--bootstrap-flavour)
+				LH_BOOTSTRAP_FLAVOUR="${2}"
+				shift 2
+				;;
+
+			--bootstrap-keyring)
+				LH_BOOTSTRAP_KEYRING="${2}"
+				shift 2
+				;;
+
+			-d|--distribution)
+				LH_DISTRIBUTION="${2}"
+				BACKPORTS="false"
+				shift 2
+
+				case "${LH_DISTRIBUTION}" in
+					lenny-backports)
+						LH_DISTRIBUTION="lenny"
+						BACKPORTS="true"
+						;;
+				esac
+				;;
+
+			-m|--mirror-bootstrap)
+				LH_MIRROR_BOOTSTRAP="${2}"
+				shift 2
+				;;
+
+			--mirror-chroot)
+				LH_MIRROR_CHROOT="${2}"
+				shift 2
+				;;
+
+			--mirror-chroot-security)
+				LH_MIRROR_CHROOT_SECURITY="${2}"
+				shift 2
+				;;
+
+			--mirror-chroot-volatile)
+				LH_MIRROR_CHROOT_VOLATILE="${2}"
+				shift 2
+				;;
+
+			--mirror-binary)
+				LH_MIRROR_BINARY="${2}"
+				shift 2
+				;;
+
+			--mirror-binary-security)
+				LH_MIRROR_BINARY_SECURITY="${2}"
+				shift 2
+				;;
+
+			--mirror-binary-volatile)
+				LH_MIRROR_BINARY_VOLATILE="${2}"
+				shift 2
+				;;
+
+			--mirror-debian-installer)
+				LH_MIRROR_DEBIAN_INSTALLER="${2}"
+				shift 2
+				;;
+
+			--archive-areas)
+				LH_ARCHIVE_AREAS="${2}"
+				shift 2
+				;;
+
+			# config/chroot
+			--chroot-filesystem)
+				LH_CHROOT_FILESYSTEM="${2}"
+				shift 2
+				;;
+
+			--virtual-root-size)
+				LH_VIRTUAL_ROOT_SIZE="${2}"
+				shift 2
+				;;
+
+			--exposed-root)
+				LH_EXPOSED_ROOT="${2}"
+				shift 2
+				;;
+
+			--gzip-options)
+				GZIP_OPTIONS="${2}"
+				shift 2
+				;;
+
+			--hooks)
+				LH_HOOKS="${2}"
+				shift 2
+				;;
+
+			--interactive)
+				LH_INTERACTIVE="${2}"
+				shift 2
+				;;
+
+			--keyring-packages)
+				LH_KEYRING_PACKAGES="${2}"
+				shift 2
+				;;
+
+			-l|--language)
+				LH_LANGUAGE="${2}"
+				shift 2
+				;;
+
+			-k|--linux-flavours)
+				LH_LINUX_FLAVOURS="${2}"
+				shift 2
+				;;
+
+			--linux-packages)
+				LH_LINUX_PACKAGES="${2}"
+				shift 2
+				;;
+
+			--packages)
+				LH_PACKAGES="${2}"
+				shift 2
+				;;
+
+			-p|--packages-lists)
+				LH_PACKAGES_LISTS="${2}"
+				shift 2
+				;;
+
+			--tasks)
+				LH_TASKS="${2}"
+				shift 2
+				;;
+
+			--security)
+				LH_SECURITY="${2}"
+				shift 2
+				;;
+
+			--volatile)
+				LH_VOLATILE="${2}"
+				shift 2
+				;;
+
+			--symlinks)
+				LH_SYMLINKS="${2}"
+				shift 2
+				;;
+
+			--sysvinit)
+				LH_SYSVINIT="${2}"
+				shift 2
+				;;
+
+			# config/binary
+			--binary-filesystem)
+				LH_BINARY_FILESYSTEM="${2}"
+				shift 2
+				;;
+
+			-b|--binary-images)
+				LH_BINARY_IMAGES="${2}"
+				shift 2
+				;;
+
+			--binary-indices)
+				LH_BINARY_INDICES="${2}"
+				shift 2
+				;;
+
+			--bootappend-live)
+				LH_BOOTAPPEND_LIVE="${2}"
+				shift 2
+				;;
+
+			--bootappend-install)
+				LH_BOOTAPPEND_INSTALL="${2}"
+				shift 2
+				;;
+
+			--bootloader)
+				LH_BOOTLOADER="${2}"
+				shift 2
+				;;
+
+			--checksums)
+				LH_CHECKSUMS="${2}"
+				shift 2
+				;;
+
+			--build-with-chroot)
+				LH_BUILD_WITH_CHROOT="${2}"
+				shift 2
+				;;
+
+			--debian-installer)
+				LH_DEBIAN_INSTALLER="${2}"
+				shift 2
+				;;
+
+			--debian-installer-distribution)
+				LH_DEBIAN_INSTALLER_DISTRIBUTION="${2}"
+				shift 2
+				;;
+
+			--debian-installer-preseedfile)
+				LH_DEBIAN_INSTALLER_PRESEEDFILE="${2}"
+				shift 2
+				;;
+
+			--debian-installer-gui)
+				LH_DEBIAN_INSTALLER_GUI="${2}"
+				shift 2
+				;;
+
+			-e|--encryption)
+				LH_ENCRYPTION="${2}"
+				shift 2
+				;;
+
+			--grub-splash)
+				LH_GRUB_SPLASH="${2}"
+				shift 2
+				;;
+
+			--hostname)
+				LH_HOSTNAME="${2}"
+				shift 2
+				;;
+
+			--isohybrid-options)
+				LH_ISOHYBRID_OPTIONS="${2}"
+				shift 2
+				;;
+
+			--iso-application)
+				LH_ISO_APPLICATION="${2}"
+				shift 2
+				;;
+
+			--iso-preparer)
+				LH_ISO_PREPARER="${2}"
+				shift 2
+				;;
+
+			--iso-publisher)
+				LH_ISO_PUBLISHER="${2}"
+				shift 2
+				;;
+
+			--iso-volume)
+				LH_ISO_VOLUME="${2}"
+				shift 2
+				;;
+
+			--jffs2-eraseblock)
+				LH_JFFS2_ERASEBLOCK="${2}"
+				shift 2
+				;;
+
+			--memtest)
+				LH_MEMTEST="${2}"
+				shift 2
+				;;
+
+			--net-root-filesystem)
+				LH_NET_ROOT_FILESYSTEM="${2}"
+				shift 2
+				;;
+
+			--net-root-mountoptions)
+				LH_NET_ROOT_MOUNTOPTIONS="${2}"
+				shift 2
+				;;
+
+			--net-root-path)
+				LH_NET_ROOT_PATH="${2}"
+				shift 2
+				;;
+
+			--net-root-server)
+				LH_NET_ROOT_SERVER="${2}"
+				shift 2
+				;;
+
+			--net-cow-filesystem)
+				LH_NET_COW_FILESYSTEM="${2}"
+				shift 2
+				;;
+
+			--net-cow-mountoptions)
+				LH_NET_COW_MOUNTOPTIONS="${2}"
+				shift 2
+				;;
+
+			--net-cow-path)
+				LH_NET_COW_PATH="${2}"
+				shift 2
+				;;
+
+			--net-cow-server)
+				LH_NET_COW_SERVER="${2}"
+				shift 2
+				;;
+
+			--net-tarball)
+				LH_NET_TARBALL="${2}"
+				shift 2
+				;;
+
+			--syslinux-splash)
+				LH_SYSLINUX_SPLASH="${2}"
+				shift 2
+				;;
+
+			--syslinux-timeout)
+				LH_SYSLINUX_TIMEOUT="${2}"
+				shift 2
+				;;
+
+			--syslinux-menu)
+				LH_SYSLINUX_MENU="${2}"
+				shift 2
+				;;
+
+			--username)
+				LH_USERNAME="${2}"
+				shift 2
+				;;
+
+			--win32-loader)
+				LH_WIN32_LOADER="${2}"
+				shift 2
+				;;
+
+			# config/source
+			--source)
+				LH_SOURCE="${2}"
+				shift 2
+				;;
+
+			-s|--source-images)
+				LH_SOURCE_IMAGES="${2}"
+				shift 2
+				;;
+
+			# other
+			--breakpoints)
+				_BREAKPOINTS="true"
+				shift
+				;;
+
+			-c|--conffile)
+				_CONFFILE="${2}"
+				shift 2
+				;;
+
+			--color)
+				_COLOR="true"
+				shift
+				;;
+
+			--debug)
+				_DEBUG="true"
+				shift
+				;;
+
+			--force)
+				_FORCE="true"
+				shift
+				;;
+
+			-h|--help)
+				Help
+				shift
+				;;
+
+			--ignore-system-defaults)
+				shift
+				;;
+
+			--quiet)
+				_QUIET="true"
+				shift
+				;;
+
+			-u|--usage)
+				Usage
+				shift
+				;;
+
+			--verbose)
+				_VERBOSE="true"
+				shift
+				;;
+
+			-v|--version)
+				Version
+				shift
+				;;
+
+			--)
+				shift
+				break
+				;;
+
+			*)
+				Echo_error "internal error %s" "${0}"
+				exit 1
+				;;
+		esac
+	done
+}
+
+# Reading system configuration
+if [ -f "${SYSTEM_LH_CONFFILE}" ] && ! In_list "--ignore-system-defaults" "${@}"
+then
+	Echo_message "Considering defaults defined in %s" "${SYSTEM_LH_CONFFILE}"
+	Read_conffiles "${SYSTEM_LH_CONFFILE}"
+fi
+
+# Reading existing configuration
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+
+Local_arguments "${@}"
+
+if [ -n "${_CONFFILE}" ]
+then
+	Read_conffiles "${_CONFFILE}"
+fi
+
+# Setting defaults
+Set_defaults
+
+# Checking defaults
+Check_defaults
+
+if [ ! -e config ]
+then
+	Echo_message "Creating config tree"
+else
+	Echo_message "Updating config tree"
+fi
+
+# Creating bootstrap configuration
+mkdir -p config
+mkdir -p config/includes
+mkdir -p config/templates
+
+# Creating live-helper configuration
+cat > config/common << EOF
+# config/common - common options for live-helper(7)
+
+# LH_CONFIG_VERSION: internal version of the configuration file format
+LH_CONFIG_VERSION="${CONFIG_VERSION}"
+
+# \$LH_APT: set package manager
+# (Default: ${LH_APT})
+LH_APT="${LH_APT}"
+
+# \$LH_APT_FTP_PROXY: set apt/aptitude ftp proxy
+# (Default: autodetected or empty)
+LH_APT_FTP_PROXY="${LH_APT_FTP_PROXY}"
+
+# \$LH_APT_HTTP_PROXY: set apt/aptitude http proxy
+# (Default: autodetected or empty)
+LH_APT_HTTP_PROXY="${LH_APT_HTTP_PROXY}"
+
+# \$LH_APT_PDIFFS: set apt/aptitude pdiff indices
+# (Default: ${LH_APT_PDIFFS})
+LH_APT_PDIFFS="${LH_APT_PDIFFS}"
+
+# \$LH_APT_PIPELINE: set apt/aptitude pipeline depth
+# (Default: ${LH_APT_PIPELINE})
+LH_APT_PIPELINE="${LH_APT_PIPELINE}"
+
+# \$LH_APT_RECOMMENDS: set apt/aptitude recommends
+# (Default: ${LH_APT_RECOMMENDS})
+LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}"
+
+# \$LH_APT_SECURE: set apt/aptitude security
+# (Default: ${LH_APT_SECURE})
+LH_APT_SECURE="${LH_APT_SECURE}"
+
+# \$LH_BOOTSTRAP: set bootstrap program
+# (Default: ${LH_BOOTSTRAP})
+LH_BOOTSTRAP="${LH_BOOTSTRAP}"
+
+# \$LH_CACHE: control cache
+# (Default: ${LH_CACHE})
+LH_CACHE="${LH_CACHE}"
+
+# \$LH_CACHE_INDICES: control if downloaded package indices should be cached
+# (Default: ${LH_CACHE_INDICES})
+LH_CACHE_INDICES="${LH_CACHE_INDICES}"
+
+# \$LH_CACHE_PACKAGES: control if downloaded packages files should be cached
+# (Default: ${LH_CACHE_PACKAGES})
+LH_CACHE_PACKAGES="${LH_CACHE_PACKAGES}"
+
+# \$LH_CACHE_STAGES: control if completed stages should be cached
+# (Default: ${LH_CACHE_STAGES})
+LH_CACHE_STAGES="${LH_CACHE_STAGES}"
+
+# \$LH_DEBCONF_FRONTEND: set debconf(1) frontend to use
+# (Default: ${LH_DEBCONF_FRONTEND})
+LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}"
+
+# \$LH_DEBCONF_NOWARNINGS: set debconf(1) warnings
+# (Default: ${LH_DEBCONF_NOWARNINGS})
+LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}"
+
+# \$LH_DEBCONF_PRIORITY: set debconf(1) priority to use
+# (Default: ${LH_DEBCONF_PRIORITY})
+LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}"
+
+# \$LH_INITRAMFS: set initramfs hook
+# (Default: ${LH_INITRAMFS})
+LH_INITRAMFS="${LH_INITRAMFS}"
+
+# \$LH_FDISK: set fdisk program
+# (Default: autodetected)
+LH_FDISK="${LH_FDISK}"
+
+# \$LH_LOSETUP: set losetup program
+# (Default: autodetected)
+LH_LOSETUP="${LH_LOSETUP}"
+
+# \$LH_MODE: set distribution mode
+# (Default: ${LH_MODE})
+LH_MODE="${LH_MODE}"
+
+# \$LH_ROOT_COMMAND: use sudo or equivalent
+# (Default: empty)
+#LH_ROOT_COMMAND="sudo"
+
+# \$LH_USE_FAKEROOT: use fakeroot/fakechroot
+# (Default: ${LH_USE_FAKEROOT})
+LH_USE_FAKEROOT="${LH_USE_FAKEROOT}"
+
+# \$LH_TASKSEL: set tasksel program
+# (Default: ${LH_TASKSEL})
+LH_TASKSEL="${LH_TASKSEL}"
+
+# \$LH_INCLUDES: set includes
+# (Default: ${LH_INCLUDES})
+LH_INCLUDES="${LH_INCLUDES}"
+
+# \$LH_TEMPLATES: set templates
+# (Default: ${LH_TEMPLATES})
+LH_TEMPLATES="${LH_TEMPLATES}"
+
+# Live-helper options
+
+# \$_BREAKPOINTS: enable breakpoints
+# (Default: ${_BREAKPOINTS})
+#_BREAKPOINTS="${_BREAKPOINTS}"
+
+# \$_DEBUG: enable debug
+# (Default: ${_DEBUG})
+#_DEBUG="${_DEBUG}"
+
+# \$_COLOR: enable color
+# (Default: ${_COLOR})
+#_COLOR="${_COLOR}"
+
+# \$_FORCE: enable force
+# (Default: ${_FORCE})
+#_FORCE="${_FORCE}"
+
+# \$_QUIET: enable quiet
+# (Default: ${_QUIET})
+_QUIET="${_QUIET}"
+
+# \$_VERBOSE: enable verbose
+# (Default: ${_VERBOSE})
+#_VERBOSE="${_VERBOSE}"
+
+# Internal stuff (FIXME)
+APT_OPTIONS="${APT_OPTIONS}"
+APTITUDE_OPTIONS="${APTITUDE_OPTIONS}"
+GZIP_OPTIONS="${GZIP_OPTIONS}"
+ISOHYBRID_OPTIONS="${ISOHYBRID_OPTIONS}"
+EOF
+
+# Creating lh_bootstrap_* configuration
+cat > config/bootstrap << EOF
+# config/bootstrap - options for live-helper(7), bootstrap stage
+
+# \$LH_ARCHITECTURE: select chroot architecture
+# (Default: autodetected)
+LH_ARCHITECTURE="${LH_ARCHITECTURE}"
+
+# \$LH_BOOTSTRAP_CONFIG: set distribution config directory
+# (Default: empty)
+LH_BOOTSTRAP_CONFIG="${LH_BOOTSTRAP_CONFIG}"
+
+# \$LH_BOOTSTRAP_INCLUDE: include packages on base
+# (Default: empty)
+LH_BOOTSTRAP_INCLUDE="${LH_BOOTSTRAP_INCLUDE}"
+
+# \$LH_BOOTSTRAP_EXCLUDE: exclude packages on base
+# (Default: empty)
+LH_BOOTSTRAP_EXCLUDE="${LH_BOOTSTRAP_EXCLUDE}"
+
+# \$LH_BOOTSTRAP_FLAVOUR: select flavour to use
+# (Default: empty)
+LH_BOOTSTRAP_FLAVOUR="${LH_BOOTSTRAP_FLAVOUR}"
+
+# \$LH_BOOTSTRAP_KEYRING: set distribution keyring
+# (Default: empty)
+LH_BOOTSTRAP_KEYRING="${LH_BOOTSTRAP_KEYRING}"
+
+# \$LH_DISTRIBUTION: select distribution to use
+# (Default: ${LH_DISTRIBUTION})
+LH_DISTRIBUTION="${LH_DISTRIBUTION}"
+
+# \$LH_MIRROR_BOOTSTRAP: set mirror to bootstrap from
+# (Default: ${LH_MIRROR_BOOTSTRAP})
+LH_MIRROR_BOOTSTRAP="${LH_MIRROR_BOOTSTRAP}"
+
+# \$LH_MIRROR_CHROOT: set mirror to fetch packages from
+# (Default: ${LH_MIRROR_CHROOT})
+LH_MIRROR_CHROOT="${LH_MIRROR_CHROOT}"
+
+# \$LH_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from
+# (Default: ${LH_MIRROR_CHROOT_SECURITY})
+LH_MIRROR_CHROOT_SECURITY="${LH_MIRROR_CHROOT_SECURITY}"
+
+# \$LH_MIRROR_CHROOT_VOLATILE: set volatile mirror to fetch packages from
+# (Default: ${LH_MIRROR_CHROOT_VOLATILE})
+LH_MIRROR_CHROOT_VOLATILE="${LH_MIRROR_CHROOT_VOLATILE}"
+
+# \$LH_MIRROR_BINARY: set mirror which ends up in the image
+# (Default: ${LH_MIRROR_BINARY})
+LH_MIRROR_BINARY="${LH_MIRROR_BINARY}"
+
+# \$LH_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
+# (Default: ${LH_MIRROR_BINARY_SECURITY})
+LH_MIRROR_BINARY_SECURITY="${LH_MIRROR_BINARY_SECURITY}"
+
+# \$LH_MIRROR_BINARY_VOLATILE: set volatile mirror which ends up in the image
+# (Default: ${LH_MIRROR_BINARY_VOLATILE})
+LH_MIRROR_BINARY_VOLATILE="${LH_MIRROR_BINARY_VOLATILE}"
+
+# \$LH_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror
+# (Default: ${LH_MIRROR_BOOTSTRAP})
+LH_MIRROR_DEBIAN_INSTALLER="${LH_MIRROR_DEBIAN_INSTALLER}"
+
+# \$LH_ARCHIVE_AREAS: select archive areas to use
+# (Default: ${LH_ARCHIVE_AREAS})
+LH_ARCHIVE_AREAS="${LH_ARCHIVE_AREAS}"
+EOF
+
+# Creating lh_chroot_* configuration
+mkdir -p config/chroot_apt
+mkdir -p config/chroot_local-hooks
+mkdir -p config/chroot_local-includes
+mkdir -p config/chroot_local-patches
+mkdir -p config/chroot_local-packages
+mkdir -p config/chroot_local-packageslists
+mkdir -p config/chroot_local-preseed
+mkdir -p config/chroot_sources
+
+cat > config/chroot << EOF
+# config/chroot - options for live-helper(7), chroot stage
+
+# \$LH_CHROOT_FILESYSTEM: set chroot filesystem
+# (Default: ${LH_CHROOT_FILESYSTEM})
+LH_CHROOT_FILESYSTEM="${LH_CHROOT_FILESYSTEM}"
+
+# \$LH_UNION_FILESYSTEM: set union filesystem
+# (Default: ${LH_UNION_FILESYSTEM})
+LH_UNION_FILESYSTEM="${LH_UNION_FILESYSTEM}"
+
+# \$LH_VIRTUAL_ROOT_SIZE: set virtual-hdd filesystem size
+# (Default: ${LH_VIRTUAL_ROOT_SIZE})
+LH_VIRTUAL_ROOT_SIZE="${LH_VIRTUAL_ROOT_SIZE}"
+
+# \$LH_EXPOSED_ROOT: expose root as read only
+# (Default: ${LH_EXPOSED_ROOT})
+LH_EXPOSED_ROOT="${LH_EXPOSED_ROOT}"
+
+# \$LH_HOOKS: set hook commands
+# (Default: empty)
+LH_HOOKS="${LH_HOOKS}"
+
+# \$LH_INTERACTIVE: set interactive build
+# (Default: ${LH_INTERACTIVE})
+LH_INTERACTIVE="${LH_INTERACTIVE}"
+
+# \$LH_KEYRING_PACKAGES: set keyring packages
+# (Default: empty)
+LH_KEYRING_PACKAGES="${LH_KEYRING_PACKAGES}"
+
+# \$LH_LANGUAGE: set language to use
+# (Default: empty)
+LH_LANGUAGE="${LH_LANGUAGE}"
+
+# \$LH_LINUX_FLAVOURS: set kernel flavour to use
+# (Default: autodetected)
+LH_LINUX_FLAVOURS="${LH_LINUX_FLAVOURS}"
+
+# \$LH_LINUX_PACKAGES: set kernel packages to use
+# (Default: autodetected)
+LH_LINUX_PACKAGES="${LH_LINUX_PACKAGES}"
+
+# \$LH_REPOSITORIES: enable available third-party repositories
+# (Default: empty)
+LH_REPOSITORIES="${LH_REPOSITORIES}"
+
+# \$LH_PACKAGES: set packages to install
+# (Default: empty)
+LH_PACKAGES="${LH_PACKAGES}"
+
+# \$LH_PACKAGES_LISTS: set package list to install
+# (Default: ${LH_PACKAGES_LISTS})
+LH_PACKAGES_LISTS="${LH_PACKAGES_LISTS}"
+
+# \$LH_TASKS: set tasks to install
+# (Default: empty)
+LH_TASKS="${LH_TASKS}"
+
+# \$LH_SECURITY: enable security updates
+# (Default: ${LH_SECURITY})
+LH_SECURITY="${LH_SECURITY}"
+
+# \$LH_VOLATILE: enable volatile updates
+# (Default: ${LH_VOLATILE})
+LH_VOLATILE="${LH_VOLATILE}"
+
+# \$LH_SYMLINKS: enable symlink convertion
+# (Default: ${LH_SYMLINKS})
+LH_SYMLINKS="${LH_SYMLINKS}"
+
+# \$LH_SYSVINIT: enable sysvinit
+# (Default: ${LH_SYSVINIT})
+LH_SYSVINIT="${LH_SYSVINIT}"
+EOF
+
+# Creating lh_binary_* configuration
+mkdir -p config/binary_debian-installer
+mkdir -p config/binary_debian-installer-includes
+mkdir -p config/binary_grub
+mkdir -p config/binary_local-debs
+mkdir -p config/binary_local-hooks
+mkdir -p config/binary_local-includes
+mkdir -p config/binary_local-packageslists
+mkdir -p config/binary_local-udebs
+mkdir -p config/binary_rootfs
+mkdir -p config/binary_syslinux
+
+cat > config/binary << EOF
+# config/binary - options for live-helper(7), binary stage
+
+# \$LH_BINARY_FILESYSTEM: set image filesystem
+# (Default: ${LH_BINARY_FILESYSTEM})
+LH_BINARY_FILESYSTEM="${LH_BINARY_FILESYSTEM}"
+
+# \$LH_BINARY_IMAGES: set image type
+# (Default: ${LH_BINARY_IMAGES})
+LH_BINARY_IMAGES="${LH_BINARY_IMAGES}"
+
+# \$LH_BINARY_INDICES: set apt/aptitude generic indices
+# (Default: ${LH_BINARY_INDICES})
+LH_BINARY_INDICES="${LH_BINARY_INDICES}"
+
+# \$LH_BOOTAPPEND_LIVE: set boot parameters
+# (Default: empty)
+LH_BOOTAPPEND_LIVE="${LH_BOOTAPPEND_LIVE}"
+
+# \$LH_BOOTAPPEND_INSTALL: set boot parameters
+# (Default: empty)
+LH_BOOTAPPEND_INSTALL="${LH_BOOTAPPEND_INSTALL}"
+
+# \$LH_BOOTLOADER: set bootloader
+# (Default: ${LH_BOOTLOADER})
+LH_BOOTLOADER="${LH_BOOTLOADER}"
+
+# \$LH_CHECKSUMS: set checksums
+# (Default: ${LH_CHECKSUMS})
+LH_CHECKSUMS="${LH_CHECKSUMS}"
+
+# \${LH_BUILD_WITH_CHROOT: control if we build binary images chrooted
+# (Default: ${LH_BUILD_WITH_CHROOT})
+# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to false.
+LH_BUILD_WITH_CHROOT="${LH_BUILD_WITH_CHROOT}"
+
+# \$LH_DEBIAN_INSTALLER: set debian-installer
+# (Default: ${LH_DEBIAN_INSTALLER})
+LH_DEBIAN_INSTALLER="${LH_DEBIAN_INSTALLER}"
+
+# \$LH_DEBIAN_INSTALLER_DISTRIBUTION: set debian-installer suite
+# (Default: empty)
+LH_DEBIAN_INSTALLER_DISTRIBUTION="${LH_DEBIAN_INSTALLER_DISTRIBUTION}"
+
+# \$LH_DEBIAN_INSTALLER_PRESEEDFILE: set debian-installer preseed filename/url
+# (Default: ${LH_DEBIAN_INSTALLER_PRESEEDFILE})
+LH_DEBIAN_INSTALLER_PRESEEDFILE="${LH_DEBIAN_INSTALLER_PRESEEDFILE}"
+
+# \$LH_DEBIAN_INSTALLER_GUI: toggle use of GUI debian-installer
+# (Default: ${LH_DEBIAN_INSTALLER_GUI})
+LH_DEBIAN_INSTALLER_GUI="${LH_DEBIAN_INSTALLER_GUI}"
+
+# \$LH_ENCRYPTION: set encryption
+# (Default: ${LH_ENCRYPTION})
+LH_ENCRYPTION="${LH_ENCRYPTION}"
+
+# \$LH_GRUB_SPLASH: set custom grub splash
+# (Default: empty)
+LH_GRUB_SPLASH="${LH_GRUB_SPLASH}"
+
+# \$LH_HOSTNAME: set hostname
+# (Default: ${LH_HOSTNAME})
+LH_HOSTNAME="${LH_HOSTNAME}"
+
+# \$LH_ISO_APPLICATION: set iso author
+# (Default: ${LH_ISO_APPLICATION})
+LH_ISO_APPLICATION="${LH_ISO_APPLICATION}"
+
+# \$LH_ISO_PREPARER: set iso preparer
+# (Default: ${LH_ISO_PREPARER})
+LH_ISO_PREPARER="${LH_ISO_PREPARER}"
+
+# \$LH_ISO_PUBLISHER: set iso publisher
+# (Default: ${LH_ISO_PUBLISHER})
+LH_ISO_PUBLISHER="${LH_ISO_PUBLISHER}"
+
+# \$LH_ISO_VOLUME: set iso volume (max 32 chars)
+# (Default: ${LH_ISO_VOLUME})
+LH_ISO_VOLUME="${LH_ISO_VOLUME}"
+
+# \$LH_JFFS2_ERASEBLOCK: set jffs2 eraseblock size
+# (Default: unset)
+LH_JFFS2_ERASEBLOCK=""
+
+# \$LH_MEMTEST: set memtest
+# (Default: ${LH_MEMTEST})
+LH_MEMTEST="${LH_MEMTEST}"
+
+# \$LH_WIN32_LOADER: set win32-loader
+# (Default: ${LH_WIN32_LOADER})
+LH_WIN32_LOADER="${LH_WIN32_LOADER}"
+
+# \$LH_NET_ROOT_FILESYSTEM: set netboot filesystem
+# (Default: ${LH_NET_ROOT_FILESYSTEM})
+LH_NET_ROOT_FILESYSTEM="${LH_NET_ROOT_FILESYSTEM}"
+
+# \$LH_NET_ROOT_MOUNTOPTIONS: set nfsopts
+# (Default: empty)
+LH_NET_ROOT_MOUNTOPTIONS="${LH_NET_ROOT_MOUNTOPTIONS}"
+
+# \$LH_NET_ROOT_PATH: set netboot server directory
+# (Default: ${LH_NET_ROOT_PATH})
+LH_NET_ROOT_PATH="${LH_NET_ROOT_PATH}"
+
+# \$LH_NET_ROOT_SERVER: set netboot server address
+# (Default: ${LH_NET_ROOT_SERVER})
+LH_NET_ROOT_SERVER="${LH_NET_ROOT_SERVER}"
+
+# \$LH_NET_COW_FILESYSTEM: set net client cow filesystem
+# (Default: ${LH_NET_COW_FILESYSTEM})
+LH_NET_COW_FILESYSTEM="${LH_NET_COW_FILESYSTEM}"
+
+# \$LH_NET_COW_MOUNTOPTIONS: set cow mount options
+# (Default: empty)
+LH_NET_COW_MOUNTOPTIONS="${LH_NET_COW_MOUNTOPTIONS}"
+
+# \$LH_NET_COW_PATH: set cow directory
+# (Default: ${LH_NET_COW_PATH})
+LH_NET_COW_PATH="${LH_NET_COW_PATH}"
+
+# \$LH_NET_COW_SERVER: set cow server
+# (Default: ${LH_NET_COW_SERVER})
+LH_NET_COW_SERVER="${LH_NET_COW_SERVER}"
+
+# \$LH_NET_TARBALL: set net tarball
+# (Default: ${LH_NET_TARBALL})
+LH_NET_TARBALL="${LH_NET_TARBALL}"
+
+# \$LH_SYSLINUX_SPLASH: set custom syslinux splash
+# (Default: empty)
+LH_SYSLINUX_SPLASH="${LH_SYSLINUX_SPLASH}"
+
+# \$LH_SYSLINUX_TIMEOUT: set custom syslinux timeout in seconds
+# (Default: 0)
+LH_SYSLINUX_TIMEOUT="${LH_SYSLINUX_TIMEOUT}"
+
+# \$LH_SYSLINUX_CFG: set custom syslinux configuration file
+# (Default: empty)
+LH_SYSLINUX_CFG="${LH_SYSLINUX_CFG}"
+
+# \$LH_SYSLINUX_MENU: set syslinux menu
+# (Default: ${LH_SYSLINUX_MENU})
+LH_SYSLINUX_MENU="${LH_SYSLINUX_MENU}"
+
+# \$LH_SYSLINUX_MENU_LIVE_ENTRY: set text to be used on the menu for live entries
+# (Default: ${LH_SYSLINUX_MENU_LIVE_ENTRY})
+LH_SYSLINUX_MENU_LIVE_ENTRY="${LH_SYSLINUX_MENU_LIVE_ENTRY}"
+
+# \$LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY: set text to be used on the menu for live entries (failsafe ones)
+# (Default: ${LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY})
+LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY="${LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY}"
+
+# \$LH_SYSLINUX_MENU_MEMTEST_ENTRY: set text to be used on the menu for memtest entry
+# (Default: ${LH_SYSLINUX_MENU_MEMTEST_ENTRY})
+LH_SYSLINUX_MENU_MEMTEST_ENTRY="${LH_SYSLINUX_MENU_MEMTEST_ENTRY}"
+
+# \$LH_USERNAME: set username
+# (Default: ${LH_USERNAME})
+LH_USERNAME="${LH_USERNAME}"
+EOF
+
+# Creating lh_source_* configuration
+cat > config/source << EOF
+# config/source - options for live-helper(7), source stage
+
+# \$LH_SOURCE: set source option
+# (Default: ${LH_SOURCE})
+LH_SOURCE="${LH_SOURCE}"
+
+# \$LH_SOURCE_IMAGES: set image type
+# (Default: ${LH_SOURCE_IMAGES})
+LH_SOURCE_IMAGES="${LH_SOURCE_IMAGES}"
+EOF
+
+mkdir -p auto/functions
+
+if [ "${CONFIG}" = "clone" ] # FIXME
+then
+	# Read package selection
+	echo $(dpkg --get-selections | awk '{ print $1 }') > config/chroot_local-packageslists/local-system
+	LH_PACKAGES_LISTS="${LH_PACKAGES_LISTS} local-system"
+
+	# Read debconf questions
+	if [ ! -f /usr/bin/debconf-get-selections ]
+	then
+		Echo_warning "Please install 'debconf-utils' in order to use this feature."
+	else
+		debconf-get-selections | grep -v deinstall | cut -f1 > config/chroot_local-preseed/local-system
+	fi
+fi
+
+if [ "${BACKPORTS}" = "true" ]
+then
+	# Adding sources.list entry
+
+cat > config/chroot_sources/${LH_DISTRIBUTION}-backports.chroot << EOF
+# Backports Maintainers
+deb http://backports.debian-maintainers.org/ ${LH_DISTRIBUTION}/backports main contrib non-free
+deb-src http://backports.debian-maintainers.org/ ${LH_DISTRIBUTION}/backports main contrib non-free
+EOF
+
+	cp config/chroot_sources/${LH_DISTRIBUTION}-backports.chroot config/chroot_sources/${LH_DISTRIBUTION}-backports.binary
+
+	# Adding apt preferences
+	if ! grep -qs "^Pin: release o=backports.debian-maintainerns.org" config/chroot_apt/preferences
+	then
+
+cat >> config/chroot_apt/preferences << EOF
+Package: *
+Pin: release o=backports.debian-maintainerns.org
+Pin-Priority: 999
+EOF
+
+	fi
+
+	# Addding archive signing key
+	wget -q http://backports.debian-maintainers.org/project/openpgp/archive-key.asc -O config/chroot_sources/${LH_DISTRIBUTION}-backports.chroot.gpg
+	cp config/chroot_sources/${LH_DISTRIBUTION}-backports.chroot.gpg config/chroot_sources/${LH_DISTRIBUTION}-backports.binary.gpg
+fi
+
+# Checking defaults again
+Check_defaults
+
+# Creating stage file
+Create_stagefile .stage/config
diff --git a/scripts/build/lh b/scripts/build/lh
new file mode 100755
index 0000000..e55feba
--- /dev/null
+++ b/scripts/build/lh
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# lh(1) - generic live-helper wrapper
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'utility to build Debian Live systems')"
+HELP="FIXME"
+USAGE="FIXME"
+
+case "${1}" in
+	-h|--help)
+		if [ -x "$(which man 2>/dev/null)" ]
+		then
+			man lh
+			exit 0
+		else
+			${0} --usage
+			exit 0
+		fi
+		;;
+
+	""|-u|--usage)
+		Usage
+		;;
+
+	-v|--version)
+		Version
+		;;
+
+	*)
+		COMMAND="${1}"
+		shift
+
+		if [ -x "${LH_BASE}/scripts/build/${COMMAND}" ]
+		then
+			LH=1 exec "${LH_BASE}/scripts/build/${COMMAND}" "${@}"
+		elif [ -x /usr/share/live-helper/scripts/build/${COMMAND} ]
+		then
+			LH=1 exec /usr/share/live-helper/scripts/build/"${COMMAND}" "${@}"
+		elif [ -x "$(which ${COMMAND} 2>/dev/null)" ]
+		then
+			LH=1 exec "${COMMAND}" "${@}"
+		else
+			Echo_error "no such script"
+			exit 1
+		fi
+		;;
+esac
diff --git a/scripts/build/live-helper b/scripts/build/live-helper
new file mode 100755
index 0000000..77d867b
--- /dev/null
+++ b/scripts/build/live-helper
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+# live-helper(7) - the Debian Live tool suite
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at debian.org>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# On Debian systems, the complete text of the GNU General Public License
+# can be found in /usr/share/common-licenses/GPL-3 file.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+if [ -x "$(which man 2>/dev/null)" ]
+then
+	man live-helper
+	exit 0
+else
+	Echo "live-helper is a set of scripts to build Debian Live system images."
+	echo
+	Echo "The idea behind live-helper is a framework that uses a configuration directory to completely automate and customize all aspects of building a Live image."
+	echo
+	Echo "An introduction to live-helper can be found in the live-helper(7) manpage."
+	exit 0
+fi
diff --git a/helpers/local b/scripts/build/local
similarity index 100%
rename from helpers/local
rename to scripts/build/local
diff --git a/scripts/build/source b/scripts/build/source
new file mode 100755
index 0000000..0d04957
--- /dev/null
+++ b/scripts/build/source
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# lh_source(1) - build source images
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'build source images')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Require_stagefile .stage/chroot_install-packages
+
+# Setup cleanup function
+Setup_cleanup
+
+# Enabling network in chroot
+lh chroot_hosts install ${*}
+lh chroot_resolv install ${*}
+lh chroot_hostname install ${*}
+lh chroot_sources install ${*}
+
+# Preparing images
+lh source_debian-live ${*}
+lh source_debian ${*}
+lh source_disk ${*}
+lh source_checksums ${*}
+
+# Building images
+lh source_iso ${*}
+lh source_net ${*}
+lh source_tar ${*}
+lh source_usb ${*}
+lh source_virtual-hdd ${*}
+
+# Deconfiguring chroot
+rm -f .stage/chroot_sources
+lh chroot_hostname remove ${*}
+lh chroot_resolv remove ${*}
+lh chroot_hosts remove ${*}
diff --git a/scripts/build/source_checksums b/scripts/build/source_checksums
new file mode 100755
index 0000000..e610c24
--- /dev/null
+++ b/scripts/build/source_checksums
@@ -0,0 +1,90 @@
+#!/bin/sh
+
+# lh_source_checksums(1) - create source checksums
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'create source checksums')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_CHECKSUMS}" = "none" ] || [ "${LH_SOURCE}" != "true" ]
+then
+	exit 0
+fi
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/source_debian
+
+# Checking stage file
+Check_stagefile .stage/source_checksums
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+for DIRECTORY in source/debian source/debian-live
+do
+	if [ ! -d ${DIRECTORY} ]
+	then
+		continue
+	fi
+
+	for CHECKSUM in ${LH_CHECKSUMS}
+	do
+		Echo_message "Begin creating source ${CHECKSUM}sum.txt..."
+
+		# Remove old checksums
+		if [ -f ${DIRECTORY}/${CHECKSUM}sum.txt ]
+		then
+			rm -f ${DIRECTORY}/${CHECKSUM}sum.txt
+		fi
+
+		# Calculating checksums
+		cd ${DIRECTORY}
+		find . -type f \
+			\! -path './md5sum.txt' \
+			\! -path './sha1sum.txt' \
+			\! -path './sha256sum.txt' \
+		-print0 | sort -z | xargs -0 ${CHECKSUM}sum > ../${CHECKSUM}sum.txt
+
+cat > ${CHECKSUM}sum.txt << EOF
+This file contains the list of ${CHECKSUM} checksums of all files on this medium.
+
+You can verify them automatically with the 'integrity-check' boot parameter,
+or, manually with: '${CHECKSUM}sum -c ${CHECKSUM}sum.txt'.
+
+
+EOF
+
+		cat ../${CHECKSUM}sum.txt >> ${CHECKSUM}sum.txt
+		rm -f ../${CHECKSUM}sum.txt
+
+		cd "${OLDPWD}"
+	done
+
+	# File list
+	cd ${DIRECTORY}
+	find . | sed -e 's|^.||g' | grep "^/" | sort > ../../$(echo ${DIRECTORY} | sed -e 's|/|.|').list
+	cd "${OLDPWD}"
+done
+
+# Creating stage file
+Create_stagefile .stage/source_checksums
diff --git a/scripts/build/source_debian b/scripts/build/source_debian
new file mode 100755
index 0000000..df7e51e
--- /dev/null
+++ b/scripts/build/source_debian
@@ -0,0 +1,153 @@
+#!/bin/sh
+
+# lh_source_debian(1) - download sources
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'debian sources')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_SOURCE}" != "true" ]
+then
+	exit 0
+fi
+
+Echo_message "Begin downloading sources..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/source_debian
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old sources
+if [ -d source/debian ]
+then
+	rm -rf source/debian
+fi
+
+# Download sources
+Chroot chroot "dpkg --get-selections" | awk '{ print $1 }' > source-selection.txt
+
+cat >> source-selection.txt << EOF
+${LH_BOOTLOADER}
+live-helper
+${LH_INITRAMFS}
+dosfstools
+genisoimage
+parted
+squashfs-tools
+genext2fs
+mtd-tools
+EOF
+
+case "${LH_ARCHITECTURE}" in
+	amd64|i386)
+
+cat >> source-selection.txt << EOF
+mtools
+syslinux
+grub
+EOF
+
+		if [ "${LH_MEMTEST}" != "false" ] && [ "${LH_MEMTEST}" != "none" ]
+		then
+			echo "${LH_MEMTEST}" >> source-selection.txt
+		fi
+		;;
+
+	powerpc)
+		echo "yaboot" >> source-selection.txt
+		;;
+
+	sparc)
+
+cat >> source-selection.txt << EOF
+silo
+sparc-utils
+EOF
+
+		;;
+esac
+
+if [ -n "${LH_TASKS}" ]
+then
+	echo "${LH_TASKSEL}" >> source-selection.txt
+fi
+
+MISSING=""
+
+grep . source-selection.txt | \
+while read PACKAGE
+do
+	if ! Chroot chroot "apt-get ${APT_OPTIONS} --download-only source ${PACKAGE}"
+	then
+		MISSING="${MISSING} ${PACKAGE}"
+	fi
+done
+
+if [ -n "${MISSING}" ]
+then
+	cat > source/missing-source.txt << EOF
+This file contains the list of binary packages that are installed on this live
+system that do not have a corresponding source package.
+
+EOF
+
+	for PACKAGE in ${MISSING}
+	do
+		Chroot chroot "dpkg -l ${PACKAGE}" | tail -n1 >> source/missing-source.txt
+	done
+fi
+
+rm -f source-selection.txt
+
+# Sort sources
+for DSC in chroot/*.dsc
+do
+	SOURCE="$(sed -n 's|^Source: ||p' ${DSC} 2>/dev/null || :)"
+	# The sed may fail if multiple dsc files exist for same source, as the
+	# first one to match will have already been moved.
+	[ -n "$SOURCE" ] || continue
+
+	case "${SOURCE}" in
+		lib?*)
+			LETTER="$(echo ${SOURCE} | sed 's|\(....\).*|\1|')"
+			;;
+
+		*)
+			LETTER="$(echo ${SOURCE} | sed 's|\(.\).*|\1|')"
+			;;
+	esac
+
+	# Install directory
+	mkdir -p source/debian/"${LETTER}"/"${SOURCE}"
+
+	# Move files
+	mv chroot/"${SOURCE}"_* source/debian/"${LETTER}"/"${SOURCE}"
+done
+
+# Creating stage file
+Create_stagefile .stage/source_debian
diff --git a/scripts/build/source_debian-live b/scripts/build/source_debian-live
new file mode 100755
index 0000000..e9bcb2f
--- /dev/null
+++ b/scripts/build/source_debian-live
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+# lh_source_debian-live(1) - copy debian-live config into source
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'copy debian-live config into source')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_SOURCE}" != "true" ]
+then
+	exit 0
+fi
+
+Echo_message "Begin copying live-helper configuration..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/source_debian-live
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old sources
+if [ -d source/debian-live ]
+then
+	rm -rf source/debian-live
+fi
+
+# Copy system configuration
+mkdir -p source/debian-live
+cp -a config source/debian-live
+
+if Find_files auto/*
+then
+	cp -a auto source/debian-live
+fi
+
+# Creating stage file
+Create_stagefile .stage/source_debian-live
diff --git a/scripts/build/source_disk b/scripts/build/source_disk
new file mode 100755
index 0000000..60aff28
--- /dev/null
+++ b/scripts/build/source_disk
@@ -0,0 +1,108 @@
+#!/bin/sh
+
+# lh_source_disk (1) - install disk information into source
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'install disk information into source')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+case "${LH_SOURCE_IMAGES}" in
+	iso*|usb*)
+		;;
+
+	*)
+		exit 0
+		;;
+esac
+
+Echo_message "Begin installing disk information..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/source_disk
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+mkdir -p source/.disk
+
+TITLE="Debian GNU/Linux"
+DISTRIBUTION="$(echo ${LH_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
+DISTRIBUTION="${DISTRIBUTION}$(echo ${LH_DISTRIBUTION} | cut -b 2-)"
+eval VERSION="$`echo RELEASE_${LH_DISTRIBUTION}`"
+
+case "${LH_MODE}" in
+	debian)
+		STRING="Official Snapshot ${ARCHITECTURE}"
+		TRACE="project/trace/ftp-master.debian.org"
+		;;
+
+	debian-release)
+		STRING="Official ${ARCHITECTURE}"
+		TRACE="project/trace/ftp-master.debian.org"
+		;;
+
+	ubuntu)
+		TITLE="Ubuntu"
+		STRING="Build ${ARCHITECTURE}"
+		TRACE=""
+		;;
+
+	*)
+		STRING="Snapshot ${ARCHITECTURE}"
+		TRACE=""
+		;;
+esac
+
+if [ -n "${TRACE}" ]
+then
+	echo "$(wget -q ${LH_MIRROR_BOOTSTRAP}/${TRACE} -O - | head -n 1)" \
+	> source/.disk/archive_trace
+fi
+
+case "${LH_DEBIAN_INSTALLER}" in
+	cdrom)
+		echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/CD Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
+		;;
+
+	true|netinst)
+		echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/NETINST Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
+		;;
+
+	live)
+		echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/INSTALL Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
+		;;
+
+	businesscard)
+		echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE/BC Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
+		;;
+
+	false)
+		echo "${TITLE} ${VERSION} \"${DISTRIBUTION}\" - ${STRING} LIVE Source $(date +%Y%m%d-%H:%M)" > source/.disk/info
+		;;
+esac
+
+# Creating stage file
+Create_stagefile .stage/source_disk
diff --git a/scripts/build/source_iso b/scripts/build/source_iso
new file mode 100755
index 0000000..3b32fbe
--- /dev/null
+++ b/scripts/build/source_iso
@@ -0,0 +1,113 @@
+#!/bin/sh
+
+# lh_source_iso(1) - build iso source image
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'build iso source image')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_SOURCE}" != "true" ]
+then
+	exit 0
+fi
+
+case "${LH_SOURCE_IMAGES}" in
+	iso*)
+		;;
+
+	*)
+		exit 0
+		;;
+esac
+
+Echo_message "Begin building source iso image..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/source_debian
+
+# Checking stage file
+Check_stagefile .stage/source_iso
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Checking depends
+Check_package chroot/usr/bin/genisoimage genisoimage
+
+# Installing depends
+Install_package
+
+# Remove old iso image
+if [ -f source.iso ]
+then
+	rm -f source.iso
+fi
+
+if [ "${_QUIET}" = "true" ]
+then
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -quiet"
+fi
+
+if [ "${_VERBOSE}" = "true" ]
+then
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v"
+fi
+
+if [ -n "${LH_ISO_APPLICATION}" ] && [ "${LH_ISO_APPLICATION}" != "none" ]
+then
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LH_ISO_APPLICATION}\""
+fi
+
+if [ -n "${LH_ISO_PREPARER}" ] && [ "${LH_ISO_PREPARER}" != "none" ]
+then
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LH_ISO_PREPARER}\""
+fi
+
+if [ -n "${LH_ISO_PUBLISHER}" ] && [ "${LH_ISO_PUBLISHER}" != "none" ]
+then
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LH_ISO_PUBLISHER}\""
+fi
+
+if [ -n "${LH_ISO_VOLUME}" ] && [ "${LH_ISO_VOLUME}" != "none" ]
+then
+	GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LH_ISO_VOLUME}\""
+fi
+
+# Moving image
+mv source chroot
+
+cat >> chroot/source.sh << EOF
+genisoimage ${GENISOIMAGE_OPTIONS} -o source.iso -r -J -l -cache-inodes source
+EOF
+
+Chroot chroot "sh source.sh"
+
+# Move image
+mv chroot/source chroot/source.iso ./
+rm -f chroot/source.sh
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/source_iso
diff --git a/scripts/build/source_net b/scripts/build/source_net
new file mode 100755
index 0000000..5cc35c8
--- /dev/null
+++ b/scripts/build/source_net
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+# lh_source_net(1) - build source net image
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'build source net image')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_SOURCE}" != "true" ]
+then
+	exit 0
+fi
+
+if ! In_list net "${LH_SOURCE_IMAGES}"
+then
+	exit 0
+fi
+
+Echo_message "Begin building source netboot image..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/source_debian
+
+# Checking stage file
+Check_stagefile .stage/source_net
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old source
+if [ -f source-net.tar.gz ]
+then
+	rm -f source-net.tar.gz
+fi
+
+# Create tarball
+tar cf source-net.tar source
+gzip ${GZIP_OPTIONS} source-net.tar
+
+# Creating stage file
+Create_stagefile .stage/source_net
diff --git a/scripts/build/source_tar b/scripts/build/source_tar
new file mode 100755
index 0000000..9da705c
--- /dev/null
+++ b/scripts/build/source_tar
@@ -0,0 +1,63 @@
+#!/bin/sh
+
+# lh_source_tar(1) - build source tarball
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'build source tarball')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_SOURCE}" != "true" ]
+then
+	exit 0
+fi
+
+if ! In_list tar "${LH_SOURCE_IMAGES}"
+then
+	exit 0
+fi
+
+Echo_message "Begin building source tarball..."
+Echo_message "This may take a while."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/source_debian
+
+# Checking stage file
+Check_stagefile .stage/source_tar
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Remove old source
+rm -f source.debian.tar.gz
+rm -f source.debian-live.tar.gz
+
+# Create tarballs
+tar cf source.debian.tar source/debian
+gzip ${GZIP_OPTIONS} source.debian.tar
+
+tar cf source.debian-live.tar source/debian-live
+gzip ${GZIP_OPTIONS} source.debian-live.tar
+
+# Creating stage file
+Create_stagefile .stage/source_tar
diff --git a/scripts/build/source_usb b/scripts/build/source_usb
new file mode 100755
index 0000000..894129a
--- /dev/null
+++ b/scripts/build/source_usb
@@ -0,0 +1,139 @@
+#!/bin/sh
+
+# lh_source_usb(1) - build source usb image
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'build source image')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_SOURCE}" != "true" ]
+then
+	exit 0
+fi
+
+if ! In_list usb-hdd "${LH_SOURCE_IMAGES}"
+then
+	exit 0
+fi
+
+Echo_message "Begin building source usb image..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/source_debian
+
+# Checking stage file
+Check_stagefile .stage/source_usb
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Checking depends
+Check_package chroot/sbin/mkdosfs dosfstools
+Check_package chroot/sbin/parted parted
+
+# Installing depends
+Install_package
+
+# Remove old source
+if [ -f source.img ]
+then
+	rm -f source.img
+fi
+
+# Everything which comes here needs to be cleaned up,
+DU_DIM="$(du -ms source | cut -f1)"
+REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LH_BINARY_FILESYSTEM})"
+dd if=/dev/zero of=source.img bs=1024k count=0 seek=${REAL_DIM}
+FREELO="$(${LH_LOSETUP} -f)"
+if [ ! -b chroot/${FREELO} ]
+then
+	MAKEDEV="true"
+
+	mv chroot/dev chroot/dev.tmp
+	find /dev | cpio -dmpu chroot
+fi
+
+case "${LH_BINARY_FILESYSTEM}" in
+	ext2|ext3)
+		PARTITION_TYPE="ext2"
+		;;
+
+	fat16|fat32)
+		PARTITION_TYPE="${LH_BINARY_FILESYSTEM}"
+		;;
+
+	*)
+		Echo_error "Unsupported binary filesystem %s" "${LH_BINARY_FILESYSTEM}"
+		exit 1
+		;;
+esac
+
+Echo_warning "!!! The following error/warning messages can be ignored !!!"
+Losetup $FREELO source.img 0
+Chroot chroot "parted -s ${FREELO} mklabel msdos" || true
+Chroot chroot "parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0.0 100%" || true
+Chroot chroot "parted -s ${FREELO} set 1 lba off" || true
+sleep 1
+${LH_LOSETUP} -d ${FREELO}
+
+Losetup $FREELO source.img 1
+
+case "${LH_BINARY_FILESYSTEM}" in
+	ext2|ext3)
+		MKFS="${LH_BINARY_FILESYSTEM}"
+		MKFS_OPTIONS="-L DEBIAN_LIVE -m 0"
+		;;
+
+	fat16)
+		MKFS="vfat"
+		MKFS_OPTIONS="-F 16 -n DEBIAN_LIVE"
+		;;
+
+	fat32)
+		MKFS="vfat"
+		MKFS_OPTIONS="-F 32 -n DEBIAN_LIVE"
+		;;
+esac
+
+Chroot chroot "mkfs.${MKFS} ${MKFS_OPTIONS} ${FREELO}"
+
+mkdir -p source.tmp
+${LH_ROOT_COMMAND} mount ${FREELO} source.tmp
+cp -r source/* source.tmp
+${LH_ROOT_COMMAND} umount source.tmp
+rmdir source.tmp
+sleep 1
+${LH_LOSETUP} -d ${FREELO}
+Echo_warning "!!! The above error/warning messages can be ignored !!!"
+
+if [ -n "${MAKEDEV}" ]
+then
+	rm -rf chroot/dev
+	mv chroot/dev.tmp chroot/dev
+fi
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/source_usb
diff --git a/scripts/build/source_virtual-hdd b/scripts/build/source_virtual-hdd
new file mode 100755
index 0000000..607ad73
--- /dev/null
+++ b/scripts/build/source_virtual-hdd
@@ -0,0 +1,114 @@
+#!/bin/sh
+
+# lh_source_virtual-hdd(1) - build source virtual-hdd image
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'build source image')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+if [ "${LH_SOURCE}" != "true" ]
+then
+	exit 0
+fi
+
+if ! In_list virtual-hdd "${LH_SOURCE_IMAGES}"
+then
+	exit 0
+fi
+
+Echo_message "Begin building source virtual-hdd image..."
+
+# Requiring stage file
+Require_stagefile .stage/config .stage/source_debian
+
+# Checking stage file
+Check_stagefile .stage/source_virtual-hdd
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
+then
+	case "${LH_BINARY_FILESYSTEM}" in
+		ext2|ext3)
+			Check_package chroot/sbin/mkfs.ext2 e2fsprogs
+			;;
+	esac
+fi
+
+# Installing depends
+Install_package
+
+# Remove old source
+if [ -f source-virtual.img ]
+then
+	rm -f source-virtual.img
+fi
+
+# Everything which comes here needs to be cleaned up,
+DU_DIM="$(du -ms source | cut -f1)"
+REAL_DIM="$(Calculate_partition_size ${DU_DIM} ${LH_BINARY_FILESYSTEM})"
+dd if=/dev/zero of=source-virtual.img bs=1024k count=0 seek=${REAL_DIM}
+
+if [ "${LH_BUILD_WITH_CHROOT}" = "true" ]
+then
+	mv source-virtual.img chroot
+
+	case "${LH_BINARY_FILESYSTEM}" in
+		ext2)
+			Chroot chroot "mkfs.ext2 -F -m 0 source-virtual.img"
+			;;
+
+		ext3)
+			Chroot chroot "mkfs.ext3 -F source-virtual.img"
+			;;
+	esac
+
+	mv chroot/source-virtual.img ./
+else
+	case "${LH_BINARY_FILESYSTEM}" in
+		ext2)
+			mkfs.ext2 -F -m 0 source-virtual.img
+			;;
+
+		ext3)
+			mkfs.ext3 -F -m 0 source-virtual.img
+			;;
+	esac
+fi
+
+mkdir -p source.tmp
+${LH_ROOT_COMMAND} mount -o loop source-virtual.img source.tmp
+cp -r source/* source.tmp
+
+${LH_ROOT_COMMAND} umount source.tmp
+rmdir source.tmp
+
+# Saving cache
+Save_cache cache/packages_binary
+
+# Removing depends
+Remove_package
+
+# Creating stage file
+Create_stagefile .stage/source_virtual-hdd
diff --git a/scripts/build/testroot b/scripts/build/testroot
new file mode 100755
index 0000000..a4149c4
--- /dev/null
+++ b/scripts/build/testroot
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+# lh_testroot(1) - ensure that a system is built as root
+# Copyright (C) 2006-2010 Daniel Baumann <daniel at 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.
+
+set -e
+
+# Including common functions
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'ensure that a system is built as root')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+# Checking user account
+if [ "$(${LH_ROOT_COMMAND} id -u)" -ne "0" ]
+then
+	Echo_error "need root privileges"
+	exit 1
+fi

-- 
live-build



More information about the debian-live-changes mailing list