Adding live-helper 1.0~a17-1.

114 files changed, 962 insertions, 502 deletions

diff --git a/debian/changelog b/debian/changelog
index 08c9df856..b7ed10aa5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+live-helper (1.0~a17-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Daniel Baumann <daniel@debian.org>  Mon,  2 Jul 2007 00:00:00 +0200
+
 live-helper (1.0~a16-1) unstable; urgency=medium
 
   * New upstream release:
diff --git a/debian/copyright b/debian/copyright
index 9f10967d0..47f1f34e8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -28,7 +28,7 @@ License:
 	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 On Debian systems, the complete text of the GNU General Public License
-can be found in /usr/share/common-licenses/GPL file.
+can be found in /usr/share/common-licenses/GPL-2 file.
 
 License (contrib/grub-splash/*, contrib/syslinux-splash/*,
 templates/syslinux/splash.rle, templates/grub/splash.xpm.gz):
@@ -61,4 +61,4 @@ templates/syslinux/splash.rle, templates/grub/splash.xpm.gz):
 	http://www.debian.org/ if you use it on a web page.
 
 The Debian packaging is (C) 2006-2007, Daniel Baumann <daniel@debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.
diff --git a/docs/ChangeLog b/docs/ChangeLog
index ca0cc3ca9..791fcf02c 100644
--- a/docs/ChangeLog
+++ b/docs/ChangeLog
@@ -1,3 +1,53 @@
+2007-07-01  Daniel Baumann  <daniel@debian.org>
+
+	* helpers/lh_binary_debian-installer:
+	  - Added caching of udebs.
+	* functions/defaults.sh, helpers/lh_binary_grub, lh_binary_syslinux,
+	  lh_binary_grub, lh_config:
+	  - Added support for aufs.
+	* Uploaded 1.0~a17-1.
+
+2007-06-30  Daniel Baumann  <daniel@debian.org>
+
+	* functions/releases.sh, helpers/lh_binary_disk, lh_source_disk,
+	  lh_chroot_hostname:
+	  - Added.
+
+2007-06-29  Daniel Baumann  <daniel@debian.org>
+
+	* helpers/lh_binary_syslinux:
+	  - Fixed damaged memtest entry.
+	  - Corrected code style.
+	  - Added NUMBER initaliazation to fixed wrong numbering when in compat
+	    mode.
+	  - Fixed bug with isolinux.cfg fuckup if flavours are in this order:
+	    686 686-bigmem.
+	* helpers/lh_binary_grub, lh_binary_linux-image, lh_binary_memtest,
+	  lh_binary_syslinux:
+	  - Added compat mode for casper/live directories.
+	* helpers/lh_binary_manifest, lh_binary_md5sum, lh_source_mdsum:
+	  - Added introductional text to the generated file.
+	* helpers/lh_binary_manifest:
+	  - Only create the correct manifest file for the respective initramfs.
+	* helpers/lh_binary_disk, lh_source_disk:
+	  - Added.
+
+2007-06-27  Otavio Salvador  <otavio@debian.org>
+
+	* helpers/lh_binary_syslinux:
+	  - Added new methods (syslinux_live_entry and syslinux_di_entry) and
+	    change whole code to use them making it much easier to read and
+	    modify.
+	* functions/arch.sh:
+	  - Added.
+	* helpers/lh_binary_grub, lh_binary_syslinux, lh_binary_yaboot:
+	  - Use the new Check_architecture method to avoid duplicated code.
+	* functions/templates.sh:
+	  - Added.
+	* helpers/lh_binary_grub, helpers/lh_binary_syslinux,
+	  helpers/lh_binary_yaboot:
+	  - Use the new Check_templates method to avoid duplicated code.
+
 2007-06-25  Daniel Baumann  <daniel@debian.org>
 
 	* helpers/lh_binary_local-hooks:
diff --git a/docs/TODO b/docs/TODO
index a06a68083..88b391653 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -8,7 +8,6 @@ ALPHA series:
 
 FIXME
   * xfce flavours seem to be damaged again
-  * multi-kernel syslinux breakage
   * yaboot (powerpc) boot support
   * grub (i386/amd64) boot support on usb* binary images
   * grub (i386/amd64) boot support on net binary images
diff --git a/examples/cron/etch+beryl.sh b/examples/cron/etch+beryl.sh
deleted file mode 100755
index 7e4ccc353..000000000
--- a/examples/cron/etch+beryl.sh
+++ /dev/null
@@ -1,179 +0,0 @@
-#!/bin/sh -x
-
-set -e
-
-BUILD="etch+beryl"
-
-# Begin custom defaults
-AUTOBUILD="enabled"
-
-DATE="r0_1.0~a16-1"
-DESTDIR="/srv/debian-unofficial/ftp/debian-live"
-TEMPDIR="/srv/tmp/live-helper"
-
-OPTIONS="--binary-indices disabled --initramfs casper"
-
-ARCHITECTURES="`dpkg --print-architecture`"
-DISTRIBUTIONS="etch"
-MIRROR_BOOTSTRAP="http://ftp.de.debian.org/debian/"
-MIRROR_BOOTSTRAP_SECURITY="http://ftp.de.debian.org/debian-security/"
-MIRROR_BINARY="http://ftp.debian.org/debian/"
-MIRROR_BINARY_SECURITY="http://security.debian.org/"
-PACKAGES_LISTS="standard gnome-desktop kde-desktop xfce-desktop"
-# End custom defaults
-
-# Checking for live-helper availability
-if [ ! -x /usr/bin/make-live ]
-then
-	exit 0
-fi
-
-# Checking for live-helper defaults
-#if [ -r /etc/default/live-helper ]
-#then
-#	. /etc/default/live-helper
-#else
-#	echo "E: /etc/default/live-helper missing."
-#	exit 1
-#fi
-
-# Checking for autobuild
-if [ "${AUTOBUILD}" != "enabled" ]
-then
-	exit 0
-fi
-
-# Checking for build directory
-if [ ! -d "${TEMPDIR}" ]
-then
-	mkdir -p "${TEMPDIR}"/debian-live
-else
-	# FIXME: maybe we should just remove the left overs.
-	echo "E: ${TEMPDIR} needs cleanup."
-	exit 1
-fi
-
-echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: begin etch+beryl build." >> /var/log/live
-
-for ARCHITECTURE in ${ARCHITECTURES}
-do
-	for DISTRIBUTION in ${DISTRIBUTIONS}
-	do
-		for PACKAGES_LIST in ${PACKAGES_LISTS}
-		do
-			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt ]
-			then
-				# Creating build directory
-				mkdir -p "${TEMPDIR}"/debian-live
-
-				cd "${TEMPDIR}"
-				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
-
-				# Beryl hook
-				mkdir -p debian-live/config/chroot_local-hooks
-				cp /usr/share/live-helper/examples/hooks/beryl.sh debian-live/config/chroot_local-hooks/beryl.sh
-				mkdir -p debian-live/config/chroot_sources
-				wget http://debian.beryl-project.org/root@lupine.me.uk.gpg -O debian-live/config/chroot_sources/beryl.build.gpg
-				wget http://debian.beryl-project.org/root@lupine.me.uk.gpg -O debian-live/config/chroot_sources/beryl.image.gpg
-				cp /usr/share/live-helper/examples/sources/beryl debian-live/config/chroot_sources/beryl.build
-				cp /usr/share/live-helper/examples/sources/beryl debian-live/config/chroot_sources/beryl.image
-
-				# Generating images
-				make-live -b iso -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source enabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
-
-				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
-			fi
-
-			if [ -f "${TEMPDIR}"/debian-live/binary.iso ] && [ -f "${TEMPDIR}"/debian-live/source.tar.gz ]
-			then
-				# Creating log directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
-
-				# Moving logs
-				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-log.txt
-				mv "${TEMPDIR}"/debian-live/binary/packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt
-
-				# Creating images directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source
-
-				# Moving images
-				mv "${TEMPDIR}"/debian-live/binary.iso "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}.iso
-				mv "${TEMPDIR}"/debian-live/source.tar.gz "${DESTDIR}"/"${BUILD}"-builds/${DATE}/source/debian-live-etch+beryl-source-${PACKAGES_LIST}.tar.gz
-			fi
-
-			if [ ! -f "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt ]
-			then
-				# Workaround of missing multi-binary support in live-helper
-				mv "${TEMPDIR}"/debian-live/binary/casper "${TEMPDIR}"/debian-live/casper.tmp
-				rm -rf "${TEMPDIR}"/debian-live/binary* "${TEMPDIR}"/debian-live/.stage/binary_*
-				mkdir "${TEMPDIR}"/debian-live/binary
-				mv "${TEMPDIR}"/debian-live/casper.tmp "${TEMPDIR}"/debian-live/binary/casper
-				touch "${TEMPDIR}"/debian-live/.stage/binary_chroot
-				touch "${TEMPDIR}"/debian-live/.stage/binary_rootfs
-
-				# Creating build directory
-				mkdir -p "${TEMPDIR}"/debian-live
-
-				cd "${TEMPDIR}"
-				echo "Begin: `date -R`" > "${TEMPDIR}"/debian-live/log.txt
-
-				# Generating images
-				make-live -b usb-hdd -s tar --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-bootstrap ${MIRROR_BOOTSTRAP} --mirror-bootstrap-security ${MIRROR_BOOTSTRAP_SECURITY} --mirror-binary ${MIRROR_BINARY} --mirror-binary-security ${MIRROR_BINARY_SECURITY} --source disabled ${OPTIONS} >> "${TEMPDIR}"/debian-live/log.txt 2>&1
-
-				echo "End: `date -R`" >> "${TEMPDIR}"/debian-live/log.txt
-			fi
-
-			if [ -f "${TEMPDIR}"/debian-live/binary.img ]
-			then
-				# Creating log directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log
-
-				# Moving logs
-				mv "${TEMPDIR}"/debian-live/log.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-log.txt
-				cp "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-iso-packages.txt "${DESTDIR}"/"${BUILD}"-builds/${DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${DATE}-usb-hdd-packages.txt
-
-				# Creating image directory
-				mkdir -p "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}
-
-				# Moving images
-				mv "${TEMPDIR}"/debian-live/binary.img "${DESTDIR}"/"${BUILD}"-builds/${DATE}/${ARCHITECTURE}/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}.img
-			fi
-
-			# Cleanup
-			cd "${TEMPDIR}"/debian-live
-			lh_clean
-		done
-
-		# Cleanup
-		cd "${TEMPDIR}"/debian-live
-		lh_clean purge
-	done
-done
-
-# Cleaning up
-if [ -f "${TEMPDIR}"/debian-live/chroot/proc/version ]
-then
-	umount "${TEMPDIR}"/debian-live/chroot/proc
-fi
-
-if [ -d "${TEMPDIR}"/debian-live/chroot/sys/kernel ]
-then
-	umount "${TEMPDIR}"/debian-live/chroot/sys
-fi
-
-# Removing build directory
-rm -rf "${TEMPDIR}"
-
-# Creating md5sums
-for DIRECTORY in "${DESTDIR}"/"${BUILD}"-builds/${DATE}/*
-do
-	cd "${DIRECTORY}"
-	md5sum * > MD5SUMS
-done
-
-# Creating current symlink
-rm -f "${DESTDIR}"/"${BUILD}"-builds/current
-ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current
-
-echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: end etch+beryl build." >> /var/log/live
diff --git a/examples/cron/etch.sh b/examples/cron/etch.sh
index f00392b71..f4626bfb1 100755
--- a/examples/cron/etch.sh
+++ b/examples/cron/etch.sh
@@ -7,8 +7,8 @@ BUILD="etch"
 # Begin custom defaults
 AUTOBUILD="enabled"
 
-DATE="r0_1.0~a16-1"
-DESTDIR="/srv/debian-unofficial/ftp/debian-live"
+DATE="r0_1.0~a17-1"
+DESTDIR="/srv/debian-unofficial/ftp/debian-live/cdimage"
 TEMPDIR="/srv/tmp/live-helper"
 
 OPTIONS="--binary-indices disabled --initramfs casper"
@@ -53,7 +53,7 @@ else
 	exit 1
 fi
 
-echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: begin etch build." >> /var/log/live
+echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: begin ${BUILD} build." >> /var/log/live
 
 for ARCHITECTURE in ${ARCHITECTURES}
 do
@@ -167,4 +167,4 @@ done
 rm -f "${DESTDIR}"/"${BUILD}"-builds/current
 ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current
 
-echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: end etch build." >> /var/log/live
+echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: end ${BUILD} build." >> /var/log/live
diff --git a/examples/cron/weekly.sh b/examples/cron/lenny.sh
index 6f4003ecf..0ce64f092 100755
--- a/examples/cron/weekly.sh
+++ b/examples/cron/lenny.sh
@@ -2,13 +2,13 @@
 
 set -e
 
-BUILD="weekly"
+BUILD="lenny"
 
 # Begin custom defaults
 AUTOBUILD="enabled"
 
 DATE="`date +%Y%m%d`"
-DESTDIR="/srv/debian-unofficial/ftp/debian-live"
+DESTDIR="/srv/debian-unofficial/ftp/debian-live/cdimage"
 TEMPDIR="/srv/tmp/live-helper"
 
 OPTIONS="--binary-indices disabled --initramfs live-initramfs"
@@ -53,7 +53,7 @@ else
 	exit 1
 fi
 
-echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: begin weekly build." >> /var/log/live
+echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: begin ${BUILD} build." >> /var/log/live
 
 for ARCHITECTURE in ${ARCHITECTURES}
 do
@@ -167,4 +167,4 @@ done
 rm -f "${DESTDIR}"/"${BUILD}"-builds/current
 ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current
 
-echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: end weekly build." >> /var/log/live
+echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: end ${BUILD} build." >> /var/log/live
diff --git a/examples/cron/daily.sh b/examples/cron/sid.sh
index 65150b5f1..1d7a5a782 100755
--- a/examples/cron/daily.sh
+++ b/examples/cron/sid.sh
@@ -2,13 +2,13 @@
 
 set -e
 
-BUILD="daily"
+BUILD="sid"
 
 # Begin custom defaults
 AUTOBUILD="enabled"
 
 DATE="`date +%Y%m%d`"
-DESTDIR="/srv/debian-unofficial/ftp/debian-live"
+DESTDIR="/srv/debian-unofficial/ftp/debian-live/cdimage"
 TEMPDIR="/srv/tmp/live-helper"
 
 OPTIONS="--binary-indices disabled --initramfs live-initramfs"
@@ -53,7 +53,7 @@ else
 	exit 1
 fi
 
-echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: begin daily build." >> /var/log/live
+echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: begin ${BUILD} build." >> /var/log/live
 
 for ARCHITECTURE in ${ARCHITECTURES}
 do
@@ -167,4 +167,4 @@ done
 rm -f "${DESTDIR}"/"${BUILD}"-builds/current
 ln -s ${DATE} "${DESTDIR}"/"${BUILD}"-builds/current
 
-echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: end daily build." >> /var/log/live
+echo "`date +%b\ %d\ %H:%M:%S` ${HOSTNAME} live-helper: end ${BUILD} build." >> /var/log/live
diff --git a/examples/cron/snapshots.sh b/examples/cron/snapshots.sh
index 5513a4b9c..642854741 100755
--- a/examples/cron/snapshots.sh
+++ b/examples/cron/snapshots.sh
@@ -3,7 +3,7 @@
 # Needs: build-essential fakeroot lsb-release svn [...]
 
 # Static variables
-PACKAGES="live-helper live-initramfs live-magic live-sysvinit live-webhelper"
+PACKAGES="live-helper live-initramfs live-initscripts live-magic live-webhelper"
 
 DEBEMAIL="debian-live-devel@lists.alioth.debian.org"
 EMAIL="debian-live-devel@lists.alioth.debian.org"
diff --git a/functions/architecture.sh b/functions/architecture.sh
new file mode 100755
index 000000000..fb0e910c1
--- /dev/null
+++ b/functions/architecture.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+# architecture.sh - handle architecture specific support
+# Copyright (C) 2007 Otavio Salvador <otavio@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
+
+Check_architecture ()
+{
+	ARCHITECTURES="${@}"
+	VALID="false"
+
+	for ARCHITECTURE in ${ARCHITECTURES}
+	do
+		if [ "${ARCHITECTURE}" = "${LIVE_ARCHITECTURE}" ]
+		then
+			VALID="true"
+			break
+		fi
+	done
+
+	if [ "${VALID}" = "false" ]
+	then
+		Echo_warning "skipping ${0}, foreign architecture."
+		exit 0
+	fi
+}
diff --git a/functions/common.sh b/functions/common.sh
index 2c3011781..a3df47716 100755
--- a/functions/common.sh
+++ b/functions/common.sh
@@ -10,4 +10,4 @@
 set -e
 
 PROGRAM="`basename ${0}`"
-VERSION="1.0~a16"
+VERSION="1.0~a17"
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 56dd5ae21..1dacb9262 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -38,7 +38,7 @@ Set_defaults ()
 		fi
 	fi
 
-	# Setting distribution value
+	# Setting distribution name
 	if [ -z "${LIVE_DISTRIBUTION}" ]
 	then
 		case "${LH_MODE}" in
@@ -90,7 +90,7 @@ Set_defaults ()
 	LH_APT_SECURE="${LH_APT_SECURE:-enabled}"
 
 	# Setting bootstrap program
-	if [ -z "${LH_BOOTSTRAP}" ] || [ ! -x "${LH_BOOTSTRAP}" ]
+	if [ -z "${LH_BOOTSTRAP}" ] || [ ! -x "`which ${LH_BOOTSTRAP}`" ]
 	then
 		case "${LH_MODE}" in
 			debian)
@@ -318,6 +318,9 @@ Set_defaults ()
 	# Setting chroot filesystem
 	LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM:-squashfs}"
 
+	# Setting union filesystem
+	LIVE_UNION_FILESYSTEM="${LIVE_UNION_FILESYSTEM:-unionfs}"
+
 	# LIVE_HOOKS
 
 	# Setting interactive shell/X11/Xnest
@@ -350,7 +353,7 @@ Set_defaults ()
 				;;
 
 			arm)
-				echo "E: You need to specify the linux kernel flavour manually on arm (FIXME)."
+				Echo_error "You need to specify the linux kernel flavour manually on arm (FIXME)."
 				exit 1
 				;;
 
@@ -375,7 +378,7 @@ Set_defaults ()
 				;;
 
 			m68k)
-				LIVE_LINUX_FLAVOURS="E: You need to specify the linux kernel flavour manually on m68k."
+				LIVE_LINUX_FLAVOURS="You need to specify the linux kernel flavour manually on m68k."
 				exit 1
 				;;
 
@@ -401,7 +404,7 @@ Set_defaults ()
 				;;
 
 			*)
-				echo "E: Architecture notyet supported (FIXME)"
+				Echo_error "Architecture notyet supported (FIXME)"
 				;;
 		esac
 	fi
@@ -411,7 +414,7 @@ Set_defaults ()
 	then
 		case "${LH_MODE}" in
 			debian)
-				LIVE_LINUX_PACKAGES="linux-image-2.6 unionfs-modules-2.6"
+				LIVE_LINUX_PACKAGES="linux-image-2.6 ${LIVE_UNION_FILESYSTEM}-modules-2.6"
 
 				if [ "${LIVE_CHROOT_FILESYSTEM}" = "squashfs" ]
 				then
@@ -507,9 +510,6 @@ Set_defaults ()
 	# Setting debian-installer option
 	LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER:-disabled}"
 
-	# Setting live-installer option
-	LIVE_LIVE_INSTALLER="${LIVE_LIVE_INSTALLER:-disabled}"
-
 	# Setting encryption
 	# LIVE_ENCRYPTION
 
diff --git a/functions/releases.sh b/functions/releases.sh
new file mode 100755
index 000000000..d6b82251a
--- /dev/null
+++ b/functions/releases.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# releases.sh - list release information
+# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Debian releases
+VERSION_etch="4.0 r0"
+VERSION_lenny="prereleased"
+VERSION_sid="unreleased"
+
+# Ubuntu releases
+VERSION_hoary="5.04"
+VERSION_breezy="5.10"
+VERSION_dapper="6.06 LTS"
+VERSION_edgy="6.10"
+VERSION_feisty="7.04"
+VERSION_gutsy="7.10"
diff --git a/functions/templates.sh b/functions/templates.sh
new file mode 100755
index 000000000..927c39ffd
--- /dev/null
+++ b/functions/templates.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# templates.sh - handle templates files
+# Copyright (C) 2007 Otavio Salvador <otavio@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
+
+Check_templates ()
+{
+	PROGRAM="${1}"
+
+	# Check local templates
+	if [ -d config/templates/"${PROGRAM}" ]
+	then
+		LIVE_TEMPLATES="config/templates"
+	fi
+
+	# Checking user templates
+	if [ ! -d "${LIVE_TEMPLATES}" ]
+	then
+		Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
+		exit 1
+	elif [ ! -d "${LIVE_TEMPLATES}/${PROGRAM}" ]
+	then
+		Echo_error "${PROGRAM} templates not accessible in ${LIVE_TEMPLATES}"
+		exit 1
+	fi
+}
diff --git a/functions/version.sh b/functions/version.sh
index 237531c3c..ef17cefba 100755
--- a/functions/version.sh
+++ b/functions/version.sh
@@ -31,7 +31,7 @@ Version ()
 	echo "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA"
 	echo
 	echo "On Debian systems, the complete text of the GNU General Public License"
-	echo "can be found in /usr/share/common-licenses/GPL file."
+	echo "can be found in /usr/share/common-licenses/GPL-2 file."
 	echo
 	echo "Homepage: <http://debian-live.alioth.debian.org/>"
 
diff --git a/helpers/lh_binary b/helpers/lh_binary
index fb91cb321..e45491efb 100755
--- a/helpers/lh_binary
+++ b/helpers/lh_binary
@@ -32,6 +32,7 @@ lh_chroot_proc install ${*}
 lh_chroot_sysfs install ${*}
 lh_chroot_hosts install ${*}
 lh_chroot_resolv install ${*}
+lh_chroot_hostname install ${*}
 lh_chroot_sources install ${*}
 
 # Building root filesystem
@@ -46,9 +47,11 @@ lh_binary_memtest ${*}
 lh_binary_grub ${*}
 lh_binary_syslinux ${*}
 lh_binary_yaboot ${*}
+lh_binary_disk ${*}
 lh_binary_includes ${*}
 lh_binary_local-includes ${*}
 lh_binary_local-hooks ${*}
+lh_binary_hacks ${*}
 lh_binary_md5sum ${*}
 
 # Building images
@@ -59,6 +62,7 @@ lh_binary_usb-hdd ${*}
 
 # Deconfiguring chroot
 rm -f .stage/chroot_sources
+lh_chroot_hostname remove ${*}
 lh_chroot_resolv remove ${*}
 lh_chroot_hosts remove ${*}
 lh_chroot_sysfs remove ${*}
diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 8bb9a77f2..4d98629f6 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -32,10 +32,29 @@ Read_conffile config/binary
 Read_conffile config/source
 Set_defaults
 
-if [ "${LIVE_DEBIAN_INSTALLER}" != "enabled" ]
-then
-	exit 0
-fi
+# Setting remote d-i directories
+case "${LIVE_DEBIAN_INSTALLER}" in
+	netinst)
+		DI="netboot/debian-installer/i386"
+ 		DI_GTK="netboot/gtk/debian-installer/i386"
+		DI_KERNEL="linux"
+		;;
+
+	cdrom|enabled)
+		DI="cdrom"
+		DI_GTK="${DI}/gtk"
+		DI_KERNEL="vmlinuz"
+		;;
+
+	disabled)
+		exit 0
+		;;
+
+	*)
+		Echo_error "debian-installer flavor ${LIVE_DEBIAN_INSTALLER} not supported."
+		exit 1
+		;;
+esac
 
 Echo_message "Begin installing debian-installer..."
 
@@ -55,7 +74,6 @@ Create_lockfile .lock
 case "${LIVE_BINARY_IMAGES}" in
 	iso)
 		DESTDIR="binary/install"
-		DI="cdrom"
 		;;
 
 	net)
@@ -68,7 +86,6 @@ case "${LIVE_BINARY_IMAGES}" in
 
 	tar|usb-hdd)
 		DESTDIR="binary/install"
-		DI="hd-media"
 
 		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
 		if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "${LIVE_BOOTLOADER}" = "syslinux" ]
@@ -130,17 +147,17 @@ if [ "${LIVE_DISTRIBUTION}" = "sid" ] # FIXME arch
 then
 	case "${LIVE_ARCHITECTURE}" in
 		amd64)
-			wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" http://people.debian.org/~aba/d-i/images/daily/cdrom/vmlinuz
-			wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" http://people.debian.org/~aba/d-i/images/daily/cdrom/initrd.gz
+			wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" http://people.debian.org/~aba/d-i/images/daily/${DI}/${DI_KERNEL}
+			wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" http://people.debian.org/~aba/d-i/images/daily/${DI}/initrd.gz
 			;;
 
 		i386)
-		 	wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" http://people.debian.org/~joeyh/d-i/images/daily/cdrom/vmlinuz
-			wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" http://people.debian.org/~joeyh/d-i/images/daily/cdrom/initrd.gz
+		 	wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" http://people.debian.org/~joeyh/d-i/images/daily/${DI}/${DI_KERNEL}
+			wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" http://people.debian.org/~joeyh/d-i/images/daily/${DI}/initrd.gz
 			;;
 	esac
 else
-	wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/vmlinuz
+	wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/"${DI_KERNEL}"
 	wget --no-clobber -O "${DESTDIR}"/"${INITRD_DI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/initrd.gz
 fi
 
@@ -153,43 +170,47 @@ then
 	then
 		case "${LIVE_ARCHITECTURE}" in
 			amd64)
-				wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" http://people.debian.org/~aba/d-i/images/daily/cdrom/gtk/vmlinuz
-				wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" http://people.debian.org/~aba/d-i/images/daily/cdrom/gtk/initrd.gz
+				wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" http://people.debian.org/~aba/d-i/images/daily/${DI_GTK}/${DI_KERNEL}
+				wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" http://people.debian.org/~aba/d-i/images/daily/${DI_GTK}/initrd.gz
 				;;
 
 			i386)
-				wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" http://people.debian.org/~joeyh/d-i/images/daily/cdrom/gtk/vmlinuz
-				wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" http://people.debian.org/~joeyh/d-i/images/daily/cdrom/gtk/initrd.gz
+				wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" http://people.debian.org/~joeyh/d-i/images/daily/${DI_GTK}/${DI_KERNEL}
+				wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" http://people.debian.org/~joeyh/d-i/images/daily/${DI_GTK}/initrd.gz
 				;;
 		esac
 	else
-		wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/gtk/vmlinuz
-		wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI}"/gtk/initrd.gz
+		wget --no-clobber -O "${DESTDIR}"/"${VMLINUZ_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI_GTK}"/"${DI_KERNEL}"
+		wget --no-clobber -O "${DESTDIR}"/"${INITRD_GI}" "${LIVE_MIRROR_BOOTSTRAP}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DI_GTK}"/initrd.gz
 	fi
 fi
 
-# Downloading additional packages
-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
+if [ "${LIVE_DEBIAN_INSTALLER}" != "netinst" ]; then
+	# Downloading additional packages
+	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
 
-case "${LIVE_ARCHITECTURE}" in
-	amd64)
-		DI_PACKAGES="linux-image-2.6-amd64 elilo lilo grub"
-		;;
+	case "${LIVE_ARCHITECTURE}" in
+		amd64)
+			DI_PACKAGES="linux-image-2.6-amd64 lilo grub"
+			;;
 
-	i386)
-		DI_PACKAGES="linux-image-2.6-486 linux-image-2.6-686 elilo lilo grub"
-		;;
+		i386)
+			DI_PACKAGES="linux-image-2.6-486 linux-image-2.6-686 elilo lilo grub"
+			;;
 
-	powerpc)
-		DI_PACKAGES="linux-image-2.6-powerpc linux-image-2.6-powerpc64 linux-image-2.6-powerpc-smp linux-image-2.6-prep yaboot" # FIXME bootloader?
-		;;
-esac
+		powerpc)
+			DI_PACKAGES="linux-image-2.6-powerpc linux-image-2.6-powerpc64 linux-image-2.6-powerpc-smp linux-image-2.6-prep yaboot" # FIXME bootloader?
+			;;
+	esac
+
+	DI_PACKAGES="${DI_PACKAGES} cryptsetup lvm2"
 
-Chroot "apt-get -o Dir::Cache=/binary.deb --download-only install --yes ${DI_PACKAGES}"
-mv chroot/binary.deb ./
-mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
+	Chroot "apt-get -o Dir::Cache=/binary.deb --download-only install --yes ${DI_PACKAGES}"
+	mv chroot/binary.deb ./
+	mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
+fi
 
 # Including base debian packages
 if [ -d cache/packages_bootstrap ]
@@ -221,6 +242,36 @@ then
 	done
 fi
 
+# Including local debs
+if ls ../config/binary_local-debs/* &> /dev/null
+then
+	for FILE in ../config/binary_local-debs/*.deb
+	do
+		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 binary/pool/main/"${LETTER}"/"${SOURCE}"
+
+		# Move files
+		cp "${FILE}" binary/pool/main/"${LETTER}"/"${SOURCE}"
+	done
+fi
+
 # Generating deb indices
 mkdir -p binary/dists/${LIVE_DISTRIBUTION}/main/binary-${LIVE_ARCHITECTURE}
 
@@ -256,9 +307,21 @@ UDEBS="`awk '/Filename: / { print $2 }' Packages`"
 # Downloading udebs
 for UDEB in ${UDEBS}
 do
-	wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
+	if [ -f ../cache/packages_debian-installer.udeb/"`basename ${UDEB}`" ]
+	then
+		# Copying cached udebs
+		cp -l ../cache/packages_debian-installer.udeb/"`basename ${UDEB}`" ./
+	else
+		# Downloading udebs
+		wget "${LIVE_MIRROR_BOOTSTRAP}"/${UDEB}
+	fi
 done
 
+# Caching udebs
+rm -rf ../cache/packages_debian-installer.udeb
+mkdir -p ../cache/packages_debian-installer.udeb
+cp -l *.udeb ../cache/packages_debian-installer.udeb
+
 # Including local udebs
 if ls ../config/binary_local-udebs/* &> /dev/null
 then
@@ -345,25 +408,5 @@ done
 
 ln -s . binary/debian
 
-# Creating disk info
-mkdir binary/.disk
-echo "main" > binary/.disk/base_components
-touch binary/.disk/base_installable
-echo "not_complete" > binary/.disk/cd_type
-echo "Debian GNU/Linux ${LIVE_DISTRIBUTION} - Unofficial ${LIVE_ARCHITECTURE} LIVE Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
-touch binary/.disk/mkisofs
-cat > binary/.disk/udeb_include << EOF
-netcfg
-ethdetect
-pcmcia-cs-udeb
-pcmciautils-udeb
-wireless-tools-udeb
-EOF
-
-if [ -d binary/pool/main/l/live-installer ]
-then
-	echo "live-installer" >> binary/.disk/udeb_include
-fi
-
 # Creating stage file
 Create_stagefile .stage/binary_debian-installer
diff --git a/helpers/lh_binary_disk b/helpers/lh_binary_disk
new file mode 100755
index 000000000..3bc123046
--- /dev/null
+++ b/helpers/lh_binary_disk
@@ -0,0 +1,109 @@
+#!/bin/sh
+
+# lh_binary_disk (1) - install disk information into binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+	. "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="install disk information into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+if [ "${LIVE_BINARY_IMAGES}" != "iso" ]
+then
+	exit 0
+fi
+
+Echo_message "Begin installing disk information..."
+
+# Requiring stage file
+Require_stagefile .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 ${LIVE_ARCHITECTURE} | sed -e 's# #/#g'`"
+DISTRIBUTION="`echo ${LIVE_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]'`"
+DISTRIBUTION="${DISTRIBUTION}`echo ${LIVE_DISTRIBUTION} | cut -b 2-`"
+eval VERSION="$`echo VERSION_${LIVE_DISTRIBUTION}`"
+
+case "${LH_MODE}" in
+	debian)
+		if [ -d binary/pool/main/b/base-installer ]
+		then
+			if [ -d binary/pool/main/l/live-installer ]
+			then
+				TYPE="LIVE/INSTALL"
+			fi
+
+			TYPE="LIVE/NETINST"
+		else
+			TYPE="LIVE"
+		fi
+
+		echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} ${TYPE} Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
+		;;
+
+	ubuntu)
+		echo "Ubuntu Linux ${VERSION} \"${DISTRIBUTION}\" - Unofficial ${ARCHITECTURE} LIVE/NETINST Binary `date +%Y%m%d-%H:%M`" > binary/.disk/info
+		# Ubuntu 7.04 "Feisty Fawn" - Release i386 (20070418)
+		;;
+esac
+
+if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
+then
+	echo "main" > binary/.disk/base_components
+
+	touch binary/.disk/base_installable
+
+	echo "not_complete" > binary/.disk/cd_type
+
+	#touch binary/.disk/mkisofs
+
+cat > binary/.disk/udeb_include << EOF
+netcfg
+ethdetect
+pcmcia-cs-udeb
+pcmciautils-udeb
+wireless-tools-udeb
+EOF
+
+	if [ -d binary/pool/main/l/live-installer ]
+	then
+		echo "live-installer" >> binary/.disk/udeb_include
+	fi
+fi
+
+# Creating stage file
+Create_stagefile .stage/binary_disk
diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub
index d559f63ff..8cf4ed711 100755
--- a/helpers/lh_binary_grub
+++ b/helpers/lh_binary_grub
@@ -45,35 +45,17 @@ Require_stagefile .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
 
-if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
-then
-	Echo_warning "skipping binary_grub, foreign architecture."
-	exit 0
-fi
-
-# Check user templates
-if [ ! -d "${LIVE_TEMPLATES}" ]
-then
-	if [ -d ../"${LIVE_TEMPLATES}" ]
-	then
-		LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
-	else
-		Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
-		exit 1
-	fi
-fi
-
-# Check local templates
-if [ -d config/templates/grub ]
-then
-	LIVE_TEMPLATES="config/templates"
-fi
+# Check architecture
+Check_architecture amd64 i386
 
 # Checking depends
 Check_package chroot/usr/sbin/grub grub
@@ -93,13 +75,22 @@ esac
 
 # Setting destination directory
 case "${LIVE_BINARY_IMAGES}" in
-	iso|tar|usb-hdd)
-		DESTDIR_LIVE="binary/live"
+	iso|tar)
+		case "${LH_INITRAMFS}" in
+			casper)
+				DESTDIR_LIVE="binary/casper"
+				;;
+
+			live-initramfs)
+				DESTDIR_LIVE="binary/live"
+				;;
+		esac
+
 		DESTDIR_INSTALL="binary/install"
 		;;
 
-	net)
-		Echo_error "not supported, aborting (FIXME)."
+	usb-hdd|net)
+		Echo_error "not yet supported, aborting (FIXME)."
 		exit 1
 	;;
 esac
@@ -165,6 +156,11 @@ then
 	esac
 fi
 
+if [ "${LIVE_UNION_FILESYSTEM}" != "unionfs" ]
+then
+	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} union=${LIVE_UNION_FILESYSTEM}"
+fi
+
 LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/  //'`"
 
 # Parameters are listed at: linux/Documentation/kernel-parameters.txt
@@ -194,7 +190,7 @@ fi
 LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
 
 # Assembling debian-installer configuration
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
 then
 	LINUX="title\t\tLive:\nroot\n\n${LINUX}"
 
diff --git a/helpers/lh_binary_hacks b/helpers/lh_binary_hacks
new file mode 100755
index 000000000..04759dbce
--- /dev/null
+++ b/helpers/lh_binary_hacks
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+# lh_binary_hacks(1) - execute hacks in binary
+# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+	. "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="execute hacks in binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+Echo_message "Begin executing hacks..."
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_hacks
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Removing live-initramfs docs
+if [ "${LH_INITRAMFS}" = "casper" ]
+then
+	rm -f binary/parameters.txt
+fi
+
+# Creating stage file
+Create_stagefile .stage/binary_hacks
diff --git a/helpers/lh_binary_includes b/helpers/lh_binary_includes
index 0841f4024..666069933 100755
--- a/helpers/lh_binary_includes
+++ b/helpers/lh_binary_includes
@@ -84,14 +84,41 @@ case "${LIVE_ARCHITECTURE}" in
 		;;
 esac
 
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+# Working arround vfat limitations
+if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ]
 then
-	# Working arround vfat limitations
-	if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ]
-	then
-		CP_OPTIONS="-L"
-	fi
+	CP_OPTIONS="-L"
+fi
+
+# Copying common templates
+if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common ] && \
+ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common/* &> /dev/null
+then
+	cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common/* binary
+fi
+
+if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common."${ARCH}" ] && \
+ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common."${ARCH}"/* &> /dev/null
+then
+	cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/common."${ARCH}"/* binary
+fi
+
+# Copying live templates
+if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live ] && \
+ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live/* &> /dev/null
+then
+	cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live/* binary
+fi
+
+if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}" ] && \
+ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}"/* &> /dev/null
+then
+	cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}"/* binary
+fi
+
 
+if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
+then
 	# Copying install templates
 	if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install ] && \
 	ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/install/* &> /dev/null
@@ -106,7 +133,19 @@ then
 	fi
 
 	# Adjusting install templates
-	DEBIAN_NAME="Debian GNU/Linux 4.0 r0 \"Etch\" - Unofficial amd64 NETINST/LIVE Binary-1"
+	ARCHITECTURE="`echo ${LIVE_ARCHITECTURE} | sed -e 's# #/#g'`"
+	DISTRIBUTION="`echo ${LIVE_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]'`"
+	DISTRIBUTION="${DISTRIBUTION}`echo ${LIVE_DISTRIBUTION} | cut -b 2-`"
+	eval VERSION="$`echo VERSION_${LIVE_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 [ "${LIVE_ARCHITECTURE}" = "i386" ]
@@ -122,18 +161,5 @@ then
 	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
 
-# Copying live templates
-if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live ] && \
-ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live/* &> /dev/null
-then
-	cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live/* binary
-fi
-
-if [ -d "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}" ] && \
-ls "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}"/* &> /dev/null
-then
-	cp -r ${CP_OPTIONS} "${LIVE_INCLUDES}"/"${LIVE_DISTRIBUTION}"/live."${ARCH}"/* binary
-fi
-
 # Creating stage file
 Create_stagefile .stage/binary_includes
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso
index e6c8ccc4f..ce17db709 100755
--- a/helpers/lh_binary_iso
+++ b/helpers/lh_binary_iso
@@ -105,7 +105,7 @@ case "${LIVE_BOOTLOADER}" in
 
 	syslinux)
 		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
-		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -b isolinux/isolinux.bin -c isolinux/boot.cat"
+		GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b isolinux/isolinux.bin -c isolinux/boot.cat"
 
 		if [ "${LIVE_PACKAGES_LISTS}" = "mini" ] || [ "${LIVE_PACKAGES_LISTS}" = "minimal" ]
 		then
diff --git a/helpers/lh_binary_linux-image b/helpers/lh_binary_linux-image
index c6bb3f825..153e476e3 100755
--- a/helpers/lh_binary_linux-image
+++ b/helpers/lh_binary_linux-image
@@ -52,7 +52,15 @@ rm -f chroot/boot/initrd*bak*
 # Setting destination directory
 case "${LIVE_BINARY_IMAGES}" in
 	iso)
-		DESTDIR="binary/live"
+		case "${LH_INITRAMFS}" in
+			casper)
+				DESTDIR="binary/casper"
+				;;
+
+			live-initramfs)
+				DESTDIR="binary/live"
+				;;
+		esac
 		;;
 
 	net)
@@ -70,6 +78,20 @@ case "${LIVE_BINARY_IMAGES}" in
 		;;
 esac
 
+case "${LIVE_ARCHITECTURE}" in
+	amd64)
+		LINUX="vmlinuz"
+		;;
+
+	i386)
+		LINUX="vmlinuz"
+		;;
+
+	powerpc)
+		LINUX="vmlinux"
+		;;
+esac
+
 # Temporary check for broken syslinux
 if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
 then
@@ -79,17 +101,14 @@ then
 		case "${LIVE_ARCHITECTURE}" in
 			amd64)
 				DESTDIR="${DESTDIR}.amd"
-				LINUX="vmlinuz"
 				;;
 
 			i386)
 				DESTDIR="${DESTDIR}.386"
-				LINUX="vmlinuz"
 				;;
 
 			powerpc)
 				DESTDIR="${DESTDIR}.ppc"
-				LINUX="vmlinux"
 				;;
 		esac
 	fi
diff --git a/helpers/lh_binary_manifest b/helpers/lh_binary_manifest
index 0ff6fa60c..779d2ed3f 100755
--- a/helpers/lh_binary_manifest
+++ b/helpers/lh_binary_manifest
@@ -48,19 +48,22 @@ Create_lockfile .lock
 
 case "${LH_INITRAMFS}" in
 	casper)
-		INITFS="casper"
+		# Add filesystem.manifest
+		Chroot "dpkg --get-selections" | awk '{ print $1 }' | sort -u > binary/casper/filesystem.manifest
 		;;
 
 	live-initramfs)
-		INITFS="live"
-		;;
-esac
+		# Add packages.list
+
+cat > binary/packages.txt << EOF
+This file contains the list of all packages installed in this live system.
 
-# Add filesystem.manifest
-Chroot "dpkg --get-selections" | awk '{ print $1 }' | sort -u > binary/${INITFS}/filesystem.manifest
 
-# Add packages.list
-Chroot "dpkg -l" > binary/packages.txt
+EOF
+
+		Chroot "dpkg -l" >> binary/packages.txt
+		;;
+esac
 
 # Creating stage file
 Create_stagefile .stage/binary_manifest
diff --git a/helpers/lh_binary_md5sum b/helpers/lh_binary_md5sum
index 861bce0d6..cb901c8e4 100755
--- a/helpers/lh_binary_md5sum
+++ b/helpers/lh_binary_md5sum
@@ -55,7 +55,18 @@ fi
 # Calculating md5sums
 cd binary
 find . -type f | sort | grep -v 'isolinux/isolinux.bin' | grep -v 'boot/grub/stage2_eltorito' | xargs md5sum > ../md5sum.txt
-mv ../md5sum.txt ./
+
+cat > md5sum.txt << EOF
+This file contains the list of md5 checksums of all files on this medium.
+
+You can verify them automatically with the 'integrity-check' boot parameter,
+or, manually with: 'md5sum -c md5sum.txt'.
+
+
+EOF
+
+cat ../md5sum.txt >> md5sum.txt
+rm -f ../md5sum.txt
 
 cd "${OLDPWD}"
 
diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest
index 329f566e6..2d413fdc1 100755
--- a/helpers/lh_binary_memtest
+++ b/helpers/lh_binary_memtest
@@ -74,7 +74,15 @@ Install_package
 # Setting destination directory
 case "${LIVE_BINARY_IMAGES}" in
 	iso)
-		DESTDIR="binary/live"
+		case "${LH_INITRAMFS}" in
+			casper)
+				DESTDIR="binary/casper"
+				;;
+
+			live-initramfs)
+				DESTDIR="binary/live"
+				;;
+		esac
 		;;
 
 	net)
@@ -82,7 +90,15 @@ case "${LIVE_BINARY_IMAGES}" in
 		;;
 
 	tar|usb-hdd)
-		DESTDIR="binary/live"
+		case "${LH_INITRAMFS}" in
+			casper)
+				DESTDIR="binary/casper"
+				;;
+
+			live-initramfs)
+				DESTDIR="binary/live"
+				;;
+		esac
 
 		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
 		if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "${LIVE_BOOTLOADER}" = "syslinux" ]
diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs
index 8c370b4ea..6f31f4eab 100755
--- a/helpers/lh_binary_rootfs
+++ b/helpers/lh_binary_rootfs
@@ -153,7 +153,7 @@ case "${LIVE_CHROOT_FILESYSTEM}" in
 
 		if [ "${LIVE_PACKAGES_LISTS}" != "minimal" ] && [ "${LIVE_PACKAGES_LISTS}" != "mini" ]
 		then
-			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e chroot/boot/${LINUX}* chroot/boot/initrd.img* chroot/${LINUX}* chroot/initrd.img* chroot/boot/config-* chroot/boot/System.map-*"
+			MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -e chroot/boot/${LINUX}* chroot/boot/initrd.img* chroot/${LINUX}* chroot/initrd.img*"
 		fi
 
 		if [ -f config/binary_rootfs/squashfs.sort ]
diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux
index 73c29e521..bfd0c0fc5 100755
--- a/helpers/lh_binary_syslinux
+++ b/helpers/lh_binary_syslinux
@@ -45,35 +45,17 @@ Require_stagefile .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
 
-if [ "${LIVE_ARCHITECTURE}" != "amd64" ] && [ "${LIVE_ARCHITECTURE}" != "i386" ]
-then
-	Echo_warning "skipping binary_syslinux, foreign architecture."
-	exit 0
-fi
-
-# Checking user templates
-if [ ! -d "${LIVE_TEMPLATES}" ]
-then
-	if [ -d ../"${LIVE_TEMPLATES}" ]
-	then
-		LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
-	else
-		Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
-		exit 1
-	fi
-fi
-
-# Check local templates
-if [ -d config/templates/syslinux ]
-then
-	LIVE_TEMPLATES="config/templates"
-fi
+# Check architecture
+Check_architecture amd64 i386
 
 # Checking depends
 Check_package chroot/usr/bin/syslinux syslinux
@@ -81,6 +63,47 @@ Check_package chroot/usr/bin/syslinux syslinux
 # Installing depends
 Install_package
 
+# Local methods
+Syslinux_live_entry ()
+{
+	LABEL="${1}"
+	KERNEL="${2}"
+	INITRD="${3}"
+	APPEND="${4}"
+
+	# pxelinux and syslinux << 3.36 lacks support to file/path
+	if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "${DIRECTORY}" != "binary" ]
+	then
+		DIRECTORY="/`basename ${DESTDIR_LIVE}`"
+		KERNEL="${DIRECTORY}/${KERNEL}"
+		INITRD="${DIRECTORY}/${INITRD}"
+	fi
+
+	LINUX_LIVE="${LINUX_LIVE}\nLABEL ${LABEL}\n"
+	LINUX_LIVE="${LINUX_LIVE}\tkernel ${KERNEL}\n"
+	LINUX_LIVE="${LINUX_LIVE}\tappend initrd=${INITRD} boot=${INITFS} LIVE_BOOTAPPEND ${APPEND}\n"
+}
+
+Syslinux_install_entry ()
+{
+	LABEL="${1}"
+	KERNEL="${2}"
+	INITRD="${3}"
+	APPEND="${4}"
+
+	# pxelinux and syslinux << 3.36 lacks support to file/path
+	if [ "${LIVE_BINARY_IMAGES}" != "net" ] && [ "${DIRECTORY}" != "binary" ]
+	then
+		DIRECTORY="/`basename ${DESTDIR_INSTALL}`"
+		KERNEL="${DIRECTORY}/${KERNEL}"
+		INITRD="${DIRECTORY}/${INITRD}"
+	fi
+
+	LINUX_INSTALL="${LINUX_INSTALL}\nLABEL ${LABEL}\n"
+	LINUX_INSTALL="${LINUX_INSTALL}\tkernel ${KERNEL}\n"
+	LINUX_INSTALL="${LINUX_INSTALL}\tappend initrd=${INITRD} ${APPEND} --\n"
+}
+
 case "${LH_INITRAMFS}" in
 	casper)
 		INITFS="casper"
@@ -94,17 +117,35 @@ esac
 # Setting destination directory
 case "${LIVE_BINARY_IMAGES}" in
 	iso)
-		DESTDIR_LIVE="binary/live"
+		case "${LH_INITRAMFS}" in
+			casper)
+				DESTDIR_LIVE="binary/casper"
+				;;
+
+			live-initramfs)
+				DESTDIR_LIVE="binary/live"
+				;;
+		esac
+
 		DESTDIR_INSTALL="binary/install"
 		;;
 
 	net)
 		DESTDIR_LIVE="tftpboot"
 		DESTDIR_INSTALL="tftpboot"
-	;;
+		;;
 
 	tar|usb-hdd)
-		DESTDIR_LIVE="binary/live"
+		case "${LH_INITRAMFS}" in
+			casper)
+				DESTDIR_LIVE="binary/casper"
+				;;
+
+			live-initramfs)
+				DESTDIR_LIVE="binary/live"
+				;;
+		esac
+
 		DESTDIR_INSTALL="binary/install"
 
 		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
@@ -177,69 +218,51 @@ then
 	esac
 fi
 
+if [ "${LIVE_UNION_FILESYSTEM}" != "unionfs" ]
+then
+	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} union=${LIVE_UNION_FILESYSTEM}"
+fi
+
 LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/  //'`"
 
 # Parameters are listed at: linux/Documentation/kernel-parameters.txt
 FAILSAFE="noapic noapm nodma nomce nolapic nosmp vga=normal"
 
 # Assembling kernel configuration
-if [ "${LIVE_BINARY_IMAGES}" != "net" ]
-then
-	DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
 
-	# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
-	if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
-	then
-		LINUX="# Debian GNU/Linux - live\nLABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
-		LINUX="${LINUX}\n\n# Debian GNU/Linux - live-failsafe\nLABEL live-failsafe\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
-	else
-		LINUX="# Debian GNU/Linux - live\nLABEL live\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
-		LINUX="${LINUX}\n\n# Debian GNU/Linux - live-failsafe\nLABEL live-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
-	fi
-else
-	DEFAULT_FLAVOUR="`echo ${LIVE_LINUX_FLAVOURS} | awk '{ print $1 }'`"
-	LINUX="# Debian GNU/Linux - live\nLABEL live\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
-	LINUX="${LINUX}\n\n# Debian GNU/Linux - live-failsafe\nLABEL live-failsafe\n\tkernel `basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR}`\n\tappend initrd=initrd.img-`basename chroot/boot/vmlinuz-*${DEFAULT_FLAVOUR} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
-fi
+# Default entries
+DEFAULT_FLAVOUR="`echo ${LIVE_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" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}"
+Syslinux_live_entry "live-failsafe" "${DEFAULT_KERNEL}" "${DEFAULT_INITRD}" "${FAILSAFE}"
 
 if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
 then
 	for KERNEL in chroot/boot/vmlinuz*
 	do
-		if [ -z "${LINUX}" ]
-		then
-			if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-			then
-				LINUX="# Debian GNU/Linux - live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
-				LINUX="${LINUX}\n\n# Debian GNU/Linux - live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
-			else
-				LINUX="# Debian GNU/Linux - live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} live_BOOTAPPEND"
-				LINUX="${LINUX}\n\n# Debian GNU/Linux - live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
-			fi
-		else
-			if [ "${LIVE_BINARY_IMAGES}" = "iso" ]
-			then
-				LINUX="${LINUX}\n\n# Debian GNU/Linux - live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
-				LINUX="${LINUX}\n\n# Debian GNU/Linux - live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`-failsafe\n\tkernel /`basename ${DESTDIR_LIVE}`/`basename ${KERNEL}`\n\tappend initrd=/`basename ${DESTDIR_LIVE}`/initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
-			else
-				LINUX="${LINUX}\n\n# Debian GNU/Linux - live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND"
-				LINUX="${LINUX}\n\n# Debian GNU/Linux - live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\nLABEL live-`basename ${KERNEL} | sed -e 's/vmlinuz-//'`\n\tkernel `basename ${KERNEL}`\n\tappend initrd=initrd.img-`basename ${KERNEL} | sed -e 's/vmlinuz-//'` boot=${INITFS} LIVE_BOOTAPPEND ${FAILSAFE}"
-			fi
-		fi
+		KERNEL_IMAGE="`basename ${KERNEL}`"
+		KERNEL_VERSION="`echo ${KERNEL_IMAGE} | sed -e 's/vmlinuz-//'`"
+		INITRD="initrd.img-${KERNEL_VERSION}"
+
+		Syslinux_live_entry "live-${KERNEL_VERSION}" "${KERNEL_IMAGE}" "${INITRD}"
+		Syslinux_live_entry "live-${KERNEL_VERSION}-failsafe" "${KERNEL_IMAGE}" "${INITRD}" "${FAILSAFE}"
 	done
 fi
 
-# Removing '//'
-LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
+LINUX_LIVE="`echo ${LINUX_LIVE} | sed -e 's/binary//g' -e 's#//#/#g'`"
 
 # Assembling debian-installer configuration
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
 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"
 
 	# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
 	if [ "${LIVE_DISTRIBUTION}" = "etch" ]
@@ -254,55 +277,31 @@ then
 		fi
 	fi
 
-	# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
-	if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
-	then
-		LIVE_LINUX_INSTALL="LABEL install\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} -- "
-		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} -- "
-		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel ${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
-
-		LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel ${VMLINUZ_DI}\n\tappend priority=low vga=normal initrd=${INITRD_DI} -- "
-		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel ${VMLINUZ_GI}\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
-
-		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel ${VMLINUZ_DI}\n\tappend vga=normal initrd=${INITRD_DI} rescue/enable=true -- "
-		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel ${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} rescue/enable=true -- "
-
-		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel ${VMLINUZ_DI}\n\tappend auto=true priority=critical vga=normal initrd=${INITRD_DI} -- "
-		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel ${VMLINUZ_GI}\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=${INITRD_GI} -- "
-	else
-		LIVE_LINUX_INSTALL="LABEL install\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
-		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL linux\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
-		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL installgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
-
-		LIVE_KENREL_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expert\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend priority=low vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
-		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL expertgui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend priority=low video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
-
-		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescue\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} rescue/enable=true -- "
-		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL rescuegui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} rescue/enable=true -- "
-
-		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL auto\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_DI}\n\tappend auto=true priority=critical vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_DI} -- "
-		LIVE_LINUX_INSTALL="${LIVE_LINUX_INSTALL}\n\nLABEL autogui\n\tkernel /`basename ${DESTDIR_INSTALL}`/${VMLINUZ_GI}\n\tappend auto=true priority=critical video=vesa:ywrap,mtrr vga=788 initrd=/`basename ${DESTDIR_INSTALL}`/${INITRD_GI} -- "
-	fi
+	Syslinux_install_entry "linux" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
+	Syslinux_install_entry "install" "${VMLINUZ_DI}" "${INITRD_DI}" "${APPEND_DI}"
+	Syslinux_install_entry "installgui" "${VMLINUZ_GI}" "${INITRD_GI}" "${APPEND_GI}"
+	Syslinux_install_entry "expert" "${VMLINUZ_DI}" "${INITRD_DI}" "priority=low ${APPEND_DI}"
+	Syslinux_install_entry "expertgui" "${VMLINUZ_GI}" "${INITRD_GI}" "priority=low ${APPEND_GI}"
+	Syslinux_install_entry "rescue" "${VMLINUZ_DI}" "${INITRD_DI}" "rescue/enable=true ${APPEND_DI}"
+	Syslinux_install_entry "rescuegui" "${VMLINUZ_GI}" "${INITRD_GI}" "rescue/enable=true ${APPEND_GI}"
+	Syslinux_install_entry "auto" "${VMLINUZ_DI}" "${INITRD_DI}" "auto=true ${APPEND_DI}"
+	Syslinux_install_entry "autogui" "${VMLINUZ_GI}" "${INITRD_GI}" "auto=true ${APPEND_GI}"
 fi
 
-LIVE_LINUX_INSTALL="`echo ${LIVE_LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
+LINUX_INSTALL="`echo ${LINUX_INSTALL} | sed -e 's/binary//g' -e 's#//#/#g'`"
 
 # Assembling memtest configuration
 if [ -f "${DESTDIR_LIVE}"/memtest ]
 then
-	if [ "${LIVE_BINARY_IMAGES}" != "net" ]
+	KERNEL_PATH="/`basename ${DESTDIR_LIVE}`/"
+
+	# pxelinux and syslinux << 3.36 lacks support to file/path
+	if [ "${LIVE_BINARY_IMAGES}" = "net" ] || [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
 	then
-		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
-		if [ "`basename ${DESTDIR_LIVE}`" = "binary" ]
-		then
-			MEMTEST="LABEL memtest\n\tkernel memtest"
-		else
-			MEMTEST="LABEL memtest\n\tkernel /`basename ${DESTDIR_LIVE}`/memtest"
-		fi
-	else
-		MEMTEST="LABEL memtest\n\tkernel memtest"
+		KERNEL_PATH=""
 	fi
 
+	MEMTEST="LABEL ${KERNEL_PATH}memtest\n\tkernel memtest"
 	MEMTEST="`echo ${MEMTEST} | sed -e 's#//#/#g'`"
 fi
 
@@ -331,7 +330,7 @@ case "${LIVE_BINARY_IMAGES}" in
 		fi
 
 		# Configure syslinux templates
-		sed -i -e "s@LIVE_LINUX_LIVE@${LINUX}@" -e "s@LIVE_LINUX_INSTALL@${LIVE_LINUX_INSTALL}@" -e "s@LIVE_MEMTEST@${MEMTEST}@" binary/isolinux/isolinux.cfg
+		sed -i -e "s@LINUX_LIVE@${LINUX_LIVE}@" -e "s@LINUX_INSTALL@${LINUX_INSTALL}@" -e "s@MEMTEST@${MEMTEST}@" binary/isolinux/isolinux.cfg
 		sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" binary/isolinux/isolinux.cfg
 		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" binary/isolinux/f1.txt
 		sed -i -e "s/LIVE_VERSION/${VERSION}/" binary/isolinux/f10.txt
@@ -342,19 +341,26 @@ case "${LIVE_BINARY_IMAGES}" in
 		# Working arround syslinux 8.3 limitation
 		if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
 		then
+			NUMBER="0"
+
+			# FIXME: This has a bug *iff* flavours = 686 686-bigmem (note the order).
+
 			for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
 			do
-				NUMBER=$(($NUMBER + 1))
+				NUMBER="$(($NUMBER + 1))"
 
 				mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
 				mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img
-				sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" binary/isolinux/isolinux.cfg
+				sed -i -e "s/vmlinuz-.*-${FLAVOUR}$/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR} /initrd${NUMBER}.img /g" binary/isolinux/isolinux.cfg
 			done
 		else
 			mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
 			mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
 			sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" binary/isolinux/isolinux.cfg
 		fi
+
+		# Remove whitespaces
+		sed -i -e 's/\ $//g' binary/isolinux/isolinux.cfg
 		;;
 
 	net)
@@ -385,7 +391,7 @@ case "${LIVE_BINARY_IMAGES}" in
 		fi
 
 		# Configure syslinux templates
-		sed -i -e "s@LIVE_LINUX_LIVE@${LINUX}@" -e "s@LIVE_LINUX_INSTALL@${LIVE_LINUX_INSTALL}@" -e "s@LIVE_MEMTEST@${MEMTEST}@" tftpboot/pxelinux.cfg/default
+		sed -i -e "s@LINUX_LIVE@${LINUX_LIVE}@" -e "s@LINUX_INSTALL@${LINUX_INSTALL}@" -e "s@MEMTEST@${MEMTEST}@" tftpboot/pxelinux.cfg/default
 		sed -i -e "s/LIVE_NET_SERVER/${LIVE_NET_SERVER}/" -e "s#LIVE_NET_PATH#${LIVE_NET_PATH}#" -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" tftpboot/pxelinux.cfg/default
 		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" tftpboot/pxelinux.cfg/f1.txt
 		sed -i -e "s/LIVE_VERSION/${VERSION}/" tftpboot/pxelinux.cfg/f10.txt
@@ -396,19 +402,24 @@ case "${LIVE_BINARY_IMAGES}" in
 		# Working arround syslinux 8.3 limitation
 		if [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
 		then
+			NUMBER="0"
+
 			for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
 			do
-				NUMBER=$(($NUMBER + 1))
+				NUMBER="$(($NUMBER + 1))"
 
 				mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
 				mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img
-				sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" binary/isolinux/isolinux.cfg
+				sed -i -e "s/vmlinuz-.*-${FLAVOUR}$/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR} /initrd${NUMBER}.img /g" binary/isolinux/isolinux.cfg
 			done
 		else
 			mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
 			mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
 			sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" binary/isolinux/isolinux.cfg
 		fi
+
+		# Remove whitespaces
+		sed -i -e 's/\ $//g' binary/isolinux/isolinux.cfg
 		;;
 
 	tar|usb-hdd)
@@ -444,7 +455,7 @@ case "${LIVE_BINARY_IMAGES}" in
 		fi
 
 		# Configure syslinux templates
-		sed -i -e "s@LIVE_LINUX_LIVE@${LINUX}@" -e "s@LIVE_LINUX_INSTALL@${LIVE_LINUX_INSTALL}@" -e "s@LIVE_MEMTEST@${MEMTEST}@" "${DESTDIR}"/syslinux.cfg
+		sed -i -e "s@LINUX_LIVE@${LINUX_LIVE}@" -e "s@LINUX_INSTALL@${LINUX_INSTALL}@" -e "s@MEMTEST@${MEMTEST}@" "${DESTDIR}"/syslinux.cfg
 		sed -i -e "s#LIVE_BOOTAPPEND#${LIVE_BOOTAPPEND}#" "${DESTDIR}"/syslinux.cfg
 		sed -i -e "s/LIVE_DATE/`date +%Y%m%d`/" "${DESTDIR}"/f1.txt
 		sed -i -e "s/LIVE_VERSION/${VERSION}/" "${DESTDIR}"/f10.txt
@@ -455,17 +466,22 @@ case "${LIVE_BINARY_IMAGES}" in
 		# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
 		if [ "${LIVE_DISTRIBUTION}" = "etch" ] && [ "`echo ${LIVE_LINUX_FLAVOURS} | wc -w`" -gt "1" ]
 		then
+			NUMBER="0"
+
 			for FLAVOUR in ${LIVE_LINUX_FLAVOURS}
 			do
-				NUMBER=$(($NUMBER + 1))
+				NUMBER="$(($NUMBER + 1))"
 				mv "${DESTDIR_LIVE}"/vmlinuz-*-${FLAVOUR} "${DESTDIR_LIVE}"/vmlinuz${NUMBER}
 				mv "${DESTDIR_LIVE}"/initrd.img-*-${FLAVOUR} "${DESTDIR_LIVE}"/initrd${NUMBER}.img
-				sed -i -e "s/vmlinuz-.*-${FLAVOUR}/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR}/initrd${NUMBER}.img/g" "${DESTDIR}"/syslinux.cfg
+				sed -i -e "s/vmlinuz-.*-${FLAVOUR}$/vmlinuz${NUMBER}/g" -e "s/initrd.img-.*-${FLAVOUR} /initrd${NUMBER}.img /g" "${DESTDIR}"/syslinux.cfg
 			done
 		else
 			mv "${DESTDIR_LIVE}"/vmlinuz-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/vmlinuz
 			mv "${DESTDIR_LIVE}"/initrd.img-*-${LIVE_LINUX_FLAVOURS} "${DESTDIR_LIVE}"/initrd.img
 			sed -i -e "s/vmlinuz-.*-${LIVE_LINUX_FLAVOURS}/vmlinuz/g" -e "s/initrd.img-.*-${LIVE_LINUX_FLAVOURS}/initrd.img/g" "${DESTDIR}"/syslinux.cfg
+
+			# Remove whitespaces
+			sed -i -e 's/\ $//g' "${DESTDIR}"/syslinux.cfg
 		fi
 		;;
 esac
diff --git a/helpers/lh_binary_usb-hdd b/helpers/lh_binary_usb-hdd
index a41723817..71353dae0 100755
--- a/helpers/lh_binary_usb-hdd
+++ b/helpers/lh_binary_usb-hdd
@@ -108,7 +108,7 @@ lh_losetup $FREELO chroot/binary.img 1
 Chroot " mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
 mkdir -p chroot/binary.tmp
 ${LH_ROOT_COMMAND} mount ${FREELO} chroot/binary.tmp
-cp -r binary/* chroot/binary.tmp
+cp -rL binary/* chroot/binary.tmp
 
 FIXME()
 {
@@ -155,7 +155,7 @@ echo "!!! The above error/warning messages can be ignored !!!"
 
 if [ -n "${MAKEDEV}" ]
 then
-	rm -f chroot/dev
+	rm -rf chroot/dev
 	mv chroot/dev.tmp chroot/dev
 fi
 
diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot
index 930c4cd57..45090da17 100755
--- a/helpers/lh_binary_yaboot
+++ b/helpers/lh_binary_yaboot
@@ -45,35 +45,17 @@ Require_stagefile .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
 
-if [ "${LIVE_ARCHITECTURE}" != "powerpc" ] && [ "${LIVE_ARCHITECTURE}" != "ppc64" ]
-then
-	Echo_warning "skipping binary_yaboot, foreign architecture."
-	#exit 0 # REMOVE_ME
-fi
-
-# Check user templates
-if [ ! -d "${LIVE_TEMPLATES}" ]
-then
-	if [ -d ../"${LIVE_TEMPLATES}" ]
-	then
-		LIVE_TEMPLATES="../${LIVE_TEMPLATES}"
-	else
-		Echo_error "user specified templates not accessible in ${LIVE_TEMPLATES}"
-		exit 1
-	fi
-fi
-
-# Checking local templates
-if [ -d config/templates/yaboot ]
-then
-	LIVE_TEMPLATES="config/templates"
-fi
+# Check architecture
+Check_architecture powerpc ppc64
 
 # Checking depends
 Check_package chroot/usr/lib/yaboot/yaboot yaboot
@@ -159,6 +141,11 @@ then
 	esac
 fi
 
+if [ "${LIVE_UNION_FILESYSTEM}" != "unionfs" ]
+then
+	LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} union=${LIVE_UNION_FILESYSTEM}"
+fi
+
 LIVE_BOOTAPPEND="`echo ${LIVE_BOOTAPPEND} | sed -e 's/  //'`"
 
 # Parameters are listed at: linux/Documentation/kernel-parameters.txt
@@ -202,7 +189,7 @@ fi
 LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
 
 # Assembling debian-installer configuration
-if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
+if [ "${LIVE_DEBIAN_INSTALLER}" != "disabled" ]
 then
 	VMLINUZ_DI="vmlinuz"
 	INITRD_DI="initrd.gz"
diff --git a/helpers/lh_chroot b/helpers/lh_chroot
index 94e60e1a1..075e0e6dc 100755
--- a/helpers/lh_chroot
+++ b/helpers/lh_chroot
@@ -40,6 +40,7 @@ lh_chroot_debianchroot install ${*}
 lh_chroot_sysvrc 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 ${*}
@@ -64,6 +65,7 @@ lh_chroot_interactive ${*}
 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_sysvrc remove ${*}
diff --git a/helpers/lh_chroot_hostname b/helpers/lh_chroot_hostname
new file mode 100755
index 000000000..be3b6af65
--- /dev/null
+++ b/helpers/lh_chroot_hostname
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+# lh_chroot_hostname(1) - manage /etc/hostname
+# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+	. "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="manage /etc/hostname"
+HELP=""
+USAGE="${PROGRAM} {install|remove} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+# Requiring stage file
+Require_stagefile .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
+
+		if [ -f chroot/etc/hostname ]
+		then
+			# Save hostname file
+			mv chroot/etc/hostname chroot/etc/hostname.orig
+		fi
+
+		# Create hostname file
+		echo "localhost.localdomain" > chroot/etc/hostname
+
+		# Set hostname
+		Chroot "hostname -F /etc/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
+
+		if [ -f chroot/etc/hostname.orig ]
+		then
+			# Restore hostname file
+			mv chroot/etc/hostname.orig chroot/etc/hostname
+		else
+			# Remove hostname file
+			rm -f chroot/etc/hostname
+		fi
+
+		# Set hostname (somehow this seems to be really needed :/)
+		if [ -f /etc/hostname ]
+		then
+			hostname -F /etc/hostname
+		fi
+
+		# Removing stage file
+		rm -f .stage/chroot_hostname
+		;;
+
+	*)
+		Usage
+		;;
+esac
diff --git a/helpers/lh_chroot_hosts b/helpers/lh_chroot_hosts
index 980743302..2cd8f0873 100755
--- a/helpers/lh_chroot_hosts
+++ b/helpers/lh_chroot_hosts
@@ -51,13 +51,21 @@ case "${1}" in
 		if [ -f chroot/etc/hosts ]
 		then
 			# Save hosts file
-			cp chroot/etc/hosts chroot/etc/hosts.orig
+			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
-			# Copy hosts file
-			cp /etc/hosts chroot/etc/hosts
+			# 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
diff --git a/helpers/lh_chroot_resolv b/helpers/lh_chroot_resolv
index 5549ccb0a..25051724a 100755
--- a/helpers/lh_chroot_resolv
+++ b/helpers/lh_chroot_resolv
@@ -51,7 +51,7 @@ case "${1}" in
 		if [ -f chroot/etc/resolv.conf ]
 		then
 			# Save resolv file
-			cp chroot/etc/resolv.conf chroot/etc/resolv.conf.orig
+			mv chroot/etc/resolv.conf chroot/etc/resolv.conf.orig
 		fi
 
 		if [ -f /etc/resolv.conf ]
diff --git a/helpers/lh_config b/helpers/lh_config
index 67ecbfb34..59d1ae64d 100755
--- a/helpers/lh_config
+++ b/helpers/lh_config
@@ -236,6 +236,10 @@ cat > "${LIVE_ROOT}"/config/chroot << EOF
 # (Default: ${LIVE_CHROOT_FILESYSTEM})
 LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}"
 
+# \$LIVE_UNION_FILESYSTEM: set union filesystem
+# (Default: ${LIVE_UNION_FILESYSTEM}
+LIVE_UNION_FILESYSTEM="${LIVE_UNION_FILESYSTEM}"
+
 # \$LIVE_HOOKS: set hook commands
 # (Default: empty)
 LIVE_HOOKS="${LIVE_HOOKS}"
@@ -291,6 +295,7 @@ EOF
 
 # Creating lh_binary_* configuration
 mkdir -p "${LIVE_ROOT}"/config/binary_grub
+mkdir -p "${LIVE_ROOT}"/config/binary_local-debs
 mkdir -p "${LIVE_ROOT}"/config/binary_local-hooks
 mkdir -p "${LIVE_ROOT}"/config/binary_local-includes
 mkdir -p "${LIVE_ROOT}"/config/binary_local-udebs
diff --git a/helpers/lh_source b/helpers/lh_source
index 40453cdc4..6e04bb4f8 100755
--- a/helpers/lh_source
+++ b/helpers/lh_source
@@ -35,11 +35,13 @@ Set_defaults
 # 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_md5sum ${*}
 
 # Building images
@@ -50,5 +52,6 @@ lh_source_usb-hdd ${*}
 
 # Deconfiguring chroot
 rm -f .stage/chroot_sources
+lh_chroot_hostname remove ${*}
 lh_chroot_resolv remove ${*}
 lh_chroot_hosts remove ${*}
diff --git a/helpers/lh_source_disk b/helpers/lh_source_disk
new file mode 100755
index 000000000..e765f3b01
--- /dev/null
+++ b/helpers/lh_source_disk
@@ -0,0 +1,84 @@
+#!/bin/sh
+
+# lh_source_disk (1) - install disk information into source
+# Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org>
+#
+# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
+# This is free software, and you are welcome to redistribute it
+# under certain conditions; see COPYING for details.
+
+set -e
+
+# Including common functions
+LH_BASE="${LH_BASE:-/usr/share/live-helper}"
+
+for FUNCTION in "${LH_BASE}"/functions/*.sh
+do
+	. "${FUNCTION}"
+done
+
+# Setting static variables
+DESCRIPTION="install disk information into source"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffile config/common
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/binary
+Read_conffile config/source
+Set_defaults
+
+if [ "${LIVE_SOURCE_IMAGES}" != "iso" ]
+then
+	exit 0
+fi
+
+Echo_message "Begin installing disk information..."
+
+# Requiring stage file
+Require_stagefile .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
+
+ARCHITECTURE="`echo ${LIVE_ARCHITECTURE} | sed -e 's# #/#g'`"
+DISTRIBUTION="`echo ${LIVE_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]'`"
+DISTRIBUTION="${DISTRIBUTION}`echo ${LIVE_DISTRIBUTION} | cut -b 2-`"
+eval VERSION="$`echo VERSION_${LIVE_DISTRIBUTION}`"
+
+case "${LH_MODE}" in
+	debian)
+		if [ -d binary/pool/main/b/base-installer ]
+		then
+			if [ -d binary/pool/main/l/live-installer ]
+			then
+				TYPE="LIVE/INSTALL"
+			fi
+
+			TYPE="LIVE/NETINST"
+		else
+			TYPE="LIVE"
+		fi
+
+		echo "Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} ${TYPE} Source `date +%Y%m%d-%H:%M`" > source/.disk/info
+		;;
+
+	ubuntu)
+		echo "Ubuntu Linux ${VERSION} \"${DISTRIBUTION}\" - Unofficial ${ARCHITECTURE} LIVE/NETINST Source `date +%Y%m%d-%H:%M`" > source/.disk/info
+		;;
+esac
+
+# Creating stage file
+Create_stagefile .stage/source_disk
diff --git a/helpers/lh_source_md5sum b/helpers/lh_source_md5sum
index 767469284..81caef45c 100755
--- a/helpers/lh_source_md5sum
+++ b/helpers/lh_source_md5sum
@@ -60,7 +60,19 @@ fi
 # Calculating md5sums
 cd source
 find . -type f | sort | xargs md5sum > ../md5sum.txt
-mv ../md5sum.txt ./
+
+cat > md5sum.txt << EOF
+This file contains the list of md5 checksums of all files on this medium.
+
+You can verify them automatically with the 'integrity-check' boot parameter,
+or, manually with: 'md5sum -c md5sum.txt'.
+
+
+EOF
+
+cat ../md5sum.txt >> md5sum.txt
+rm -f ../md5sum.txt
+
 cd "${OLDPWD}"
 
 # Creating stage file
diff --git a/helpers/lh_source_usb-hdd b/helpers/lh_source_usb-hdd
index 903f2bbb7..3487b6328 100755
--- a/helpers/lh_source_usb-hdd
+++ b/helpers/lh_source_usb-hdd
@@ -101,7 +101,7 @@ echo "!!! The above error/warning messages can be ignored !!!"
 
 if [ -n "${MAKEDEV}" ]
 then
-	rm -f chroot/dev
+	rm -rf chroot/dev
 	mv chroot/dev.tmp chroot/dev
 fi
 
diff --git a/helpers/make-live b/helpers/make-live
index fee621e47..40b2617eb 100755
--- a/helpers/make-live
+++ b/helpers/make-live
@@ -18,7 +18,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 #
 # On Debian systems, the complete text of the GNU General Public License
-# can be found in /usr/share/common-licenses/GPL file.
+# can be found in /usr/share/common-licenses/GPL-2 file.
 
 set -e
 
diff --git a/includes/sid/install/doc/00-INDEX b/includes/sid/common/doc/00-INDEX
index 041eacaa5..041eacaa5 100644
--- a/includes/sid/install/doc/00-INDEX
+++ b/includes/sid/common/doc/00-INDEX
diff --git a/includes/sid/install/doc/FAQ/debian-faq.en.html.tar.gz b/includes/sid/common/doc/FAQ/debian-faq.en.html.tar.gz
index 4deda612c..4deda612c 100644
--- a/includes/sid/install/doc/FAQ/debian-faq.en.html.tar.gz
+++ b/includes/sid/common/doc/FAQ/debian-faq.en.html.tar.gz
diff --git a/includes/sid/install/doc/FAQ/debian-faq.en.pdf.gz b/includes/sid/common/doc/FAQ/debian-faq.en.pdf.gz
index 265fe0f15..265fe0f15 100644
--- a/includes/sid/install/doc/FAQ/debian-faq.en.pdf.gz
+++ b/includes/sid/common/doc/FAQ/debian-faq.en.pdf.gz
diff --git a/includes/sid/install/doc/FAQ/debian-faq.en.ps.gz b/includes/sid/common/doc/FAQ/debian-faq.en.ps.gz
index da9048045..da9048045 100644
--- a/includes/sid/install/doc/FAQ/debian-faq.en.ps.gz
+++ b/includes/sid/common/doc/FAQ/debian-faq.en.ps.gz
diff --git a/includes/sid/install/doc/FAQ/debian-faq.en.txt.gz b/includes/sid/common/doc/FAQ/debian-faq.en.txt.gz
index 0543b2be0..0543b2be0 100644
--- a/includes/sid/install/doc/FAQ/debian-faq.en.txt.gz
+++ b/includes/sid/common/doc/FAQ/debian-faq.en.txt.gz
diff --git a/includes/sid/install/doc/FAQ/html/ch-basic_defs.en.html b/includes/sid/common/doc/FAQ/html/ch-basic_defs.en.html
index aac1358c5..aac1358c5 100644
--- a/includes/sid/install/doc/FAQ/html/ch-basic_defs.en.html
+++ b/includes/sid/common/doc/FAQ/html/ch-basic_defs.en.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-basic_defs.html b/includes/sid/common/doc/FAQ/html/ch-basic_defs.html
index 6bee626aa..6bee626aa 120000
--- a/includes/sid/install/doc/FAQ/html/ch-basic_defs.html
+++ b/includes/sid/common/doc/FAQ/html/ch-basic_defs.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-compat.en.html b/includes/sid/common/doc/FAQ/html/ch-compat.en.html
index 4e92270c0..4e92270c0 100644
--- a/includes/sid/install/doc/FAQ/html/ch-compat.en.html
+++ b/includes/sid/common/doc/FAQ/html/ch-compat.en.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-compat.html b/includes/sid/common/doc/FAQ/html/ch-compat.html
index 069644986..069644986 120000
--- a/includes/sid/install/doc/FAQ/html/ch-compat.html
+++ b/includes/sid/common/doc/FAQ/html/ch-compat.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-contributing.en.html b/includes/sid/common/doc/FAQ/html/ch-contributing.en.html
index ae790badd..ae790badd 100644
--- a/includes/sid/install/doc/FAQ/html/ch-contributing.en.html
+++ b/includes/sid/common/doc/FAQ/html/ch-contributing.en.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-contributing.html b/includes/sid/common/doc/FAQ/html/ch-contributing.html
index 4185524fd..4185524fd 120000
--- a/includes/sid/install/doc/FAQ/html/ch-contributing.html
+++ b/includes/sid/common/doc/FAQ/html/ch-contributing.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-customizing.en.html b/includes/sid/common/doc/FAQ/html/ch-customizing.en.html
index 0185e6ce4..0185e6ce4 100644
--- a/includes/sid/install/doc/FAQ/html/ch-customizing.en.html
+++ b/includes/sid/common/doc/FAQ/html/ch-customizing.en.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-customizing.html b/includes/sid/common/doc/FAQ/html/ch-customizing.html
index 1cfdfaae7..1cfdfaae7 120000
--- a/includes/sid/install/doc/FAQ/html/ch-customizing.html
+++ b/includes/sid/common/doc/FAQ/html/ch-customizing.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-faqinfo.en.html b/includes/sid/common/doc/FAQ/html/ch-faqinfo.en.html
index 1d4f43b35..1d4f43b35 100644
--- a/includes/sid/install/doc/FAQ/html/ch-faqinfo.en.html
+++ b/includes/sid/common/doc/FAQ/html/ch-faqinfo.en.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-faqinfo.html b/includes/sid/common/doc/FAQ/html/ch-faqinfo.html
index 0f759b493..0f759b493 120000
--- a/includes/sid/install/doc/FAQ/html/ch-faqinfo.html
+++ b/includes/sid/common/doc/FAQ/html/ch-faqinfo.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-ftparchives.en.html b/includes/sid/common/doc/FAQ/html/ch-ftparchives.en.html
index 6560f1407..6560f1407 100644
--- a/includes/sid/install/doc/FAQ/html/ch-ftparchives.en.html
+++ b/includes/sid/common/doc/FAQ/html/ch-ftparchives.en.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-ftparchives.html b/includes/sid/common/doc/FAQ/html/ch-ftparchives.html
index cdad69f63..cdad69f63 120000
--- a/includes/sid/install/doc/FAQ/html/ch-ftparchives.html
+++ b/includes/sid/common/doc/FAQ/html/ch-ftparchives.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-getting.en.html b/includes/sid/common/doc/FAQ/html/ch-getting.en.html
index fe19d0836..fe19d0836 100644
--- a/includes/sid/install/doc/FAQ/html/ch-getting.en.html
+++ b/includes/sid/common/doc/FAQ/html/ch-getting.en.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-getting.html b/includes/sid/common/doc/FAQ/html/ch-getting.html
index 568d808b9..568d808b9 120000
--- a/includes/sid/install/doc/FAQ/html/ch-getting.html
+++ b/includes/sid/common/doc/FAQ/html/ch-getting.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-kernel.en.html b/includes/sid/common/doc/FAQ/html/ch-kernel.en.html
index 28e150f5c..28e150f5c 100644
--- a/includes/sid/install/doc/FAQ/html/ch-kernel.en.html
+++ b/includes/sid/common/doc/FAQ/html/ch-kernel.en.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-kernel.html b/includes/sid/common/doc/FAQ/html/ch-kernel.html
index 125039fb4..125039fb4 120000
--- a/includes/sid/install/doc/FAQ/html/ch-kernel.html
+++ b/includes/sid/common/doc/FAQ/html/ch-kernel.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-nexttime.en.html b/includes/sid/common/doc/FAQ/html/ch-nexttime.en.html
index 2df0e3f73..2df0e3f73 100644
--- a/includes/sid/install/doc/FAQ/html/ch-nexttime.en.html
+++ b/includes/sid/common/doc/FAQ/html/ch-nexttime.en.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-nexttime.html b/includes/sid/common/doc/FAQ/html/ch-nexttime.html
index da23d4849..da23d4849 120000
--- a/includes/sid/install/doc/FAQ/html/ch-nexttime.html
+++ b/includes/sid/common/doc/FAQ/html/ch-nexttime.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-pkg_basics.en.html b/includes/sid/common/doc/FAQ/html/ch-pkg_basics.en.html
index a26e8ee17..a26e8ee17 100644
--- a/includes/sid/install/doc/FAQ/html/ch-pkg_basics.en.html
+++ b/includes/sid/common/doc/FAQ/html/ch-pkg_basics.en.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-pkg_basics.html b/includes/sid/common/doc/FAQ/html/ch-pkg_basics.html
index 98c97fece..98c97fece 120000
--- a/includes/sid/install/doc/FAQ/html/ch-pkg_basics.html
+++ b/includes/sid/common/doc/FAQ/html/ch-pkg_basics.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-pkgtools.en.html b/includes/sid/common/doc/FAQ/html/ch-pkgtools.en.html
index 2183ae950..2183ae950 100644
--- a/includes/sid/install/doc/FAQ/html/ch-pkgtools.en.html
+++ b/includes/sid/common/doc/FAQ/html/ch-pkgtools.en.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-pkgtools.html b/includes/sid/common/doc/FAQ/html/ch-pkgtools.html
index 6c9eeed19..6c9eeed19 120000
--- a/includes/sid/install/doc/FAQ/html/ch-pkgtools.html
+++ b/includes/sid/common/doc/FAQ/html/ch-pkgtools.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-redistrib.en.html b/includes/sid/common/doc/FAQ/html/ch-redistrib.en.html
index 8242553b6..8242553b6 100644
--- a/includes/sid/install/doc/FAQ/html/ch-redistrib.en.html
+++ b/includes/sid/common/doc/FAQ/html/ch-redistrib.en.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-redistrib.html b/includes/sid/common/doc/FAQ/html/ch-redistrib.html
index f1826236b..f1826236b 120000
--- a/includes/sid/install/doc/FAQ/html/ch-redistrib.html
+++ b/includes/sid/common/doc/FAQ/html/ch-redistrib.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-software.en.html b/includes/sid/common/doc/FAQ/html/ch-software.en.html
index afb823b5d..afb823b5d 100644
--- a/includes/sid/install/doc/FAQ/html/ch-software.en.html
+++ b/includes/sid/common/doc/FAQ/html/ch-software.en.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-software.html b/includes/sid/common/doc/FAQ/html/ch-software.html
index f75c0ab2c..f75c0ab2c 120000
--- a/includes/sid/install/doc/FAQ/html/ch-software.html
+++ b/includes/sid/common/doc/FAQ/html/ch-software.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-support.en.html b/includes/sid/common/doc/FAQ/html/ch-support.en.html
index f910fe751..f910fe751 100644
--- a/includes/sid/install/doc/FAQ/html/ch-support.en.html
+++ b/includes/sid/common/doc/FAQ/html/ch-support.en.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-support.html b/includes/sid/common/doc/FAQ/html/ch-support.html
index 978d556ab..978d556ab 120000
--- a/includes/sid/install/doc/FAQ/html/ch-support.html
+++ b/includes/sid/common/doc/FAQ/html/ch-support.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-uptodate.en.html b/includes/sid/common/doc/FAQ/html/ch-uptodate.en.html
index 180431bcf..180431bcf 100644
--- a/includes/sid/install/doc/FAQ/html/ch-uptodate.en.html
+++ b/includes/sid/common/doc/FAQ/html/ch-uptodate.en.html
diff --git a/includes/sid/install/doc/FAQ/html/ch-uptodate.html b/includes/sid/common/doc/FAQ/html/ch-uptodate.html
index 37f685277..37f685277 120000
--- a/includes/sid/install/doc/FAQ/html/ch-uptodate.html
+++ b/includes/sid/common/doc/FAQ/html/ch-uptodate.html
diff --git a/includes/sid/install/doc/FAQ/html/footnotes.en.html b/includes/sid/common/doc/FAQ/html/footnotes.en.html
index 37d57bb1e..37d57bb1e 100644
--- a/includes/sid/install/doc/FAQ/html/footnotes.en.html
+++ b/includes/sid/common/doc/FAQ/html/footnotes.en.html
diff --git a/includes/sid/install/doc/FAQ/html/footnotes.html b/includes/sid/common/doc/FAQ/html/footnotes.html
index c18fdfb77..c18fdfb77 120000
--- a/includes/sid/install/doc/FAQ/html/footnotes.html
+++ b/includes/sid/common/doc/FAQ/html/footnotes.html
diff --git a/includes/sid/install/doc/FAQ/html/index.en.html b/includes/sid/common/doc/FAQ/html/index.en.html
index 7adba8c74..7adba8c74 100644
--- a/includes/sid/install/doc/FAQ/html/index.en.html
+++ b/includes/sid/common/doc/FAQ/html/index.en.html
diff --git a/includes/sid/install/doc/FAQ/html/index.html b/includes/sid/common/doc/FAQ/html/index.html
index 0e8542211..0e8542211 120000
--- a/includes/sid/install/doc/FAQ/html/index.html
+++ b/includes/sid/common/doc/FAQ/html/index.html
diff --git a/includes/sid/install/doc/bug-log-access.txt b/includes/sid/common/doc/bug-log-access.txt
index c8fa75f57..c8fa75f57 100644
--- a/includes/sid/install/doc/bug-log-access.txt
+++ b/includes/sid/common/doc/bug-log-access.txt
diff --git a/includes/sid/install/doc/bug-log-mailserver.txt b/includes/sid/common/doc/bug-log-mailserver.txt
index aa28efc56..aa28efc56 100644
--- a/includes/sid/install/doc/bug-log-mailserver.txt
+++ b/includes/sid/common/doc/bug-log-mailserver.txt
diff --git a/includes/sid/install/doc/bug-mailserver-refcard.txt b/includes/sid/common/doc/bug-mailserver-refcard.txt
index b3ce5456a..b3ce5456a 100644
--- a/includes/sid/install/doc/bug-mailserver-refcard.txt
+++ b/includes/sid/common/doc/bug-mailserver-refcard.txt
diff --git a/includes/sid/install/doc/bug-maint-info.txt b/includes/sid/common/doc/bug-maint-info.txt
index de36df0b8..de36df0b8 100644
--- a/includes/sid/install/doc/bug-maint-info.txt
+++ b/includes/sid/common/doc/bug-maint-info.txt
diff --git a/includes/sid/install/doc/bug-maint-mailcontrol.txt b/includes/sid/common/doc/bug-maint-mailcontrol.txt
index 52f847498..52f847498 100644
--- a/includes/sid/install/doc/bug-maint-mailcontrol.txt
+++ b/includes/sid/common/doc/bug-maint-mailcontrol.txt
diff --git a/includes/sid/install/doc/bug-reporting.txt b/includes/sid/common/doc/bug-reporting.txt
index 8ea79c537..8ea79c537 100644
--- a/includes/sid/install/doc/bug-reporting.txt
+++ b/includes/sid/common/doc/bug-reporting.txt
diff --git a/includes/sid/install/doc/constitution.txt b/includes/sid/common/doc/constitution.txt
index 70eca90ff..70eca90ff 100644
--- a/includes/sid/install/doc/constitution.txt
+++ b/includes/sid/common/doc/constitution.txt
diff --git a/includes/sid/install/doc/debian-manifesto b/includes/sid/common/doc/debian-manifesto
index 9322c934f..9322c934f 100644
--- a/includes/sid/install/doc/debian-manifesto
+++ b/includes/sid/common/doc/debian-manifesto
diff --git a/includes/sid/install/doc/mailing-lists.txt b/includes/sid/common/doc/mailing-lists.txt
index 5d4a6ed42..5d4a6ed42 100644
--- a/includes/sid/install/doc/mailing-lists.txt
+++ b/includes/sid/common/doc/mailing-lists.txt
diff --git a/includes/sid/install/doc/social-contract.txt b/includes/sid/common/doc/social-contract.txt
index e0ddb27fc..e0ddb27fc 100644
--- a/includes/sid/install/doc/social-contract.txt
+++ b/includes/sid/common/doc/social-contract.txt
diff --git a/includes/sid/install/doc/source-unpack.txt b/includes/sid/common/doc/source-unpack.txt
index 151b7337d..151b7337d 100644
--- a/includes/sid/install/doc/source-unpack.txt
+++ b/includes/sid/common/doc/source-unpack.txt
diff --git a/includes/sid/live/boot-parameters.txt b/includes/sid/live/parameters.txt
index ba856aa71..ba856aa71 100644
--- a/includes/sid/live/boot-parameters.txt
+++ b/includes/sid/live/parameters.txt
diff --git a/manpages/lh_binary.de.1 b/manpages/lh_binary.de.1
index 022491ea4..f55bd49df 100644
--- a/manpages/lh_binary.de.1
+++ b/manpages/lh_binary.de.1
@@ -1,4 +1,4 @@
-.TH LH_BINARY 1 "25.06.2007" "1.0~a16" "live\-helper"
+.TH LH_BINARY 1 "02.07.2007" "1.0~a17" "live\-helper"
 
 .SH NAME
 lh_binary \- Meta\-Helper f\[:u]r lh_binary_*
diff --git a/manpages/lh_binary.en.1 b/manpages/lh_binary.en.1
index bf2415c41..6b8a111e2 100644
--- a/manpages/lh_binary.en.1
+++ b/manpages/lh_binary.en.1
@@ -1,4 +1,4 @@
-.TH LH_BINARY 1 "2007\-06\-25" "1.0~a16" "live\-helper"
+.TH LH_BINARY 1 "2007\-07\-02" "1.0~a17" "live\-helper"
 
 .SH NAME
 lh_binary \- meta\-helper for lh_binary_*
diff --git a/manpages/lh_bootstrap.de.1 b/manpages/lh_bootstrap.de.1
index f43a1c381..65473561d 100644
--- a/manpages/lh_bootstrap.de.1
+++ b/manpages/lh_bootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP 1 "25.06.2007" "1.0~a16" "live\-helper"
+.TH LH_BOOTSTRAP 1 "02.07.2007" "1.0~a17" "live\-helper"
 
 .SH NAME
 lh_bootstrap \- Meta\-Helper f\[:u]r lh_bootstrap_*
diff --git a/manpages/lh_bootstrap.en.1 b/manpages/lh_bootstrap.en.1
index c5b6e9be1..39723cda9 100644
--- a/manpages/lh_bootstrap.en.1
+++ b/manpages/lh_bootstrap.en.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP 1 "2007\-06\-25" "1.0~a16" "live\-helper"
+.TH LH_BOOTSTRAP 1 "2007\-07\-02" "1.0~a17" "live\-helper"
 
 .SH NAME
 lh_bootstrap \- meta\-helper for lh_bootstrap_*
diff --git a/manpages/lh_bootstrap_cdebootstrap.de.1 b/manpages/lh_bootstrap_cdebootstrap.de.1
index ae96f533e..1c093a054 100644
--- a/manpages/lh_bootstrap_cdebootstrap.de.1
+++ b/manpages/lh_bootstrap_cdebootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "25.06.2007" "1.0~a16" "live\-helper"
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "02.07.2007" "1.0~a17" "live\-helper"
 
 .SH NAME
 lh_bootstrap_cdebootstrap \- erstellt ein Debian-System mit \fIcdebootstrap\fR(1)
diff --git a/manpages/lh_bootstrap_cdebootstrap.en.1 b/manpages/lh_bootstrap_cdebootstrap.en.1
index 4338b424f..e30f28b40 100644
--- a/manpages/lh_bootstrap_cdebootstrap.en.1
+++ b/manpages/lh_bootstrap_cdebootstrap.en.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-06\-25" "1.0~a16" "live\-helper"
+.TH LH_BOOTSTRAP_CDEBOOTSTRAP 1 "2007\-07\-02" "1.0~a17" "live\-helper"
 
 .SH NAME
 lh_bootstrap_cdebootstrap \- bootstrap a Debian system with \fIcdebootstrap\fR(1)
diff --git a/manpages/lh_bootstrap_debootstrap.de.1 b/manpages/lh_bootstrap_debootstrap.de.1
index dd6d904ec..d765b5b1a 100644
--- a/manpages/lh_bootstrap_debootstrap.de.1
+++ b/manpages/lh_bootstrap_debootstrap.de.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "25.06.2007" "1.0~a16" "live\-helper"
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "02.07.2007" "1.0~a17" "live\-helper"
 
 .SH NAME
 lh_bootstrap_debootstrap \- erstellt ein Debian-System mit \fIdebootstrap\fR(8)
diff --git a/manpages/lh_bootstrap_debootstrap.en.1 b/manpages/lh_bootstrap_debootstrap.en.1
index 174f47e64..55741c29e 100644
--- a/manpages/lh_bootstrap_debootstrap.en.1
+++ b/manpages/lh_bootstrap_debootstrap.en.1
@@ -1,4 +1,4 @@
-.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-06\-25" "1.0~a16" "live\-helper"
+.TH LH_BOOTSTRAP_DEBOOTSTRAP 1 "2007\-07\-02" "1.0~a17" "live\-helper"
 
 .SH NAME
 lh_bootstrap_debootstrap \- bootstrap a Debian system with \fIdebootstrap\fR(8)
diff --git a/manpages/lh_build.de.1 b/manpages/lh_build.de.1
index 519632f94..4b25878d1 100644
--- a/manpages/lh_build.de.1
+++ b/manpages/lh_build.de.1
@@ -1,4 +1,4 @@
-.TH LH_BUILD 1 "25.06.2007" "1.0~a16" "live\-helper"
+.TH LH_BUILD 1 "02.07.2007" "1.0~a17" "live\-helper"
 
 .SH NAME
 lh_build \- erstellen eines Live-Systemes
diff --git a/manpages/lh_build.en.1 b/manpages/lh_build.en.1
index 1f35366ad..18eeb4cf6 100644
--- a/manpages/lh_build.en.1
+++ b/manpages/lh_build.en.1
@@ -1,4 +1,4 @@
-.TH LH_BUILD 1 "2007\-06\-25" "1.0~a16" "live\-helper"
+.TH LH_BUILD 1 "2007\-07\-02" "1.0~a17" "live\-helper"
 
 .SH NAME
 lh_build \- building a live system
diff --git a/manpages/lh_chroot.de.1 b/manpages/lh_chroot.de.1
index ed0708911..9e43b9ba6 100644
--- a/manpages/lh_chroot.de.1
+++ b/manpages/lh_chroot.de.1
@@ -1,4 +1,4 @@
-.TH LH_CHROOT 1 "25.06.2007" "1.0~a16" "live\-helper"
+.TH LH_CHROOT 1 "02.07.2007" "1.0~a17" "live\-helper"
 
 .SH NAME
 lh_chroot \- Meta\-Helper f\[:u]r lh_chroot_*
diff --git a/manpages/lh_chroot.en.1 b/manpages/lh_chroot.en.1
index 13801fa59..1529b5b8f 100644
--- a/manpages/lh_chroot.en.1
+++ b/manpages/lh_chroot.en.1
@@ -1,4 +1,4 @@
-.TH LH_CHROOT 1 "2007\-06\-25" "1.0~a16" "live\-helper"
+.TH LH_CHROOT 1 "2007\-07\-02" "1.0~a17" "live\-helper"
 
 .SH NAME
 lh_chroot \- meta\-helper for lh_chroot_*
diff --git a/manpages/lh_clean.de.1 b/manpages/lh_clean.de.1
index f70e71b29..de676c0d2 100644
--- a/manpages/lh_clean.de.1
+++ b/manpages/lh_clean.de.1
@@ -1,4 +1,4 @@
-.TH LH_CLEAN 1 "25.06.2007" "1.0~a16" "live\-helper"
+.TH LH_CLEAN 1 "02.07.2007" "1.0~a17" "live\-helper"
 
 .SH NAME
 lh_clean \- r\[:a]umt das Build-Verzeichnis auf
diff --git a/manpages/lh_clean.en.1 b/manpages/lh_clean.en.1
index eff370635..35b037a17 100644
--- a/manpages/lh_clean.en.1
+++ b/manpages/lh_clean.en.1
@@ -1,4 +1,4 @@
-.TH LH_CLEAN 1 "2007\-06\-25" "1.0~a16" "live\-helper"
+.TH LH_CLEAN 1 "2007\-07\-02" "1.0~a17" "live\-helper"
 
 .SH NAME
 lh_clean \- clean up system build directories
diff --git a/manpages/lh_source.de.1 b/manpages/lh_source.de.1
index 7d40c17ab..ba82ace3f 100644
--- a/manpages/lh_source.de.1
+++ b/manpages/lh_source.de.1
@@ -1,4 +1,4 @@
-.TH LH_SOURCE 1 "25.06.2007" "1.0~a16" "live\-helper"
+.TH LH_SOURCE 1 "02.07.2007" "1.0~a17" "live\-helper"
 
 .SH NAME
 lh_source \- Meta\-Helper f\[:u]r lh_source_*
diff --git a/manpages/lh_source.en.1 b/manpages/lh_source.en.1
index 63407a5a5..8c564e1ae 100644
--- a/manpages/lh_source.en.1
+++ b/manpages/lh_source.en.1
@@ -1,4 +1,4 @@
-.TH LH_SOURCE 1 "2007\-06\-25" "1.0~a16" "live\-helper"
+.TH LH_SOURCE 1 "2007\-07\-02" "1.0~a17" "live\-helper"
 
 .SH NAME
 lh_source \- meta\-helper for lh_source_*
diff --git a/manpages/lh_testroot.de.1 b/manpages/lh_testroot.de.1
index 1474993a1..fb3a785c3 100644
--- a/manpages/lh_testroot.de.1
+++ b/manpages/lh_testroot.de.1
@@ -1,4 +1,4 @@
-.TH LH_TESTROOT 1 "25.06.2007" "1.0~a16" "live\-helper"
+.TH LH_TESTROOT 1 "02.07.2007" "1.0~a17" "live\-helper"
 
 .SH NAME
 lh_testroot \- stellt sicher dass das System als root gebaut wird
diff --git a/manpages/lh_testroot.en.1 b/manpages/lh_testroot.en.1
index a9667b024..74061c8c1 100644
--- a/manpages/lh_testroot.en.1
+++ b/manpages/lh_testroot.en.1
@@ -1,4 +1,4 @@
-.TH LH_TESTROOT 1 "2007\-06\-25" "1.0~a16" "live\-helper"
+.TH LH_TESTROOT 1 "2007\-07\-02" "1.0~a17" "live\-helper"
 
 .SH NAME
 lh_testroot \- ensure that a system is built as root
diff --git a/manpages/live-helper.de.7 b/manpages/live-helper.de.7
index 3cf296ff2..ba4284b15 100644
--- a/manpages/live-helper.de.7
+++ b/manpages/live-helper.de.7
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 7 "25.06.2007" "1.0~a16" "live\-helper"
+.TH LIVE\-HELPER 7 "02.07.2007" "1.0~a17" "live\-helper"
 
 .SH NAME
 live\-helper \- Debian Live Helper-Programme
@@ -164,7 +164,7 @@ gibt Versionsinformationen aus und stoppt.
 .SH SIEHE AUCH
 \fIlive\-initramfs\fR(7)
 .PP
-\fIlive\-sysvinit\fR(7)
+\fIlive\-initscripts\fR(7)
 .PP
 \fIlive\-webhelper\fR(7)
 
diff --git a/manpages/live-helper.en.7 b/manpages/live-helper.en.7
index c4e251fbd..4ffef45cc 100644
--- a/manpages/live-helper.en.7
+++ b/manpages/live-helper.en.7
@@ -1,4 +1,4 @@
-.TH LIVE\-HELPER 7 "2007\-06\-25" "1.0~a16" "live\-helper"
+.TH LIVE\-HELPER 7 "2007\-07\-02" "1.0~a17" "live\-helper"
 
 .SH NAME
 live\-helper \- Debian Live helper programs
@@ -162,7 +162,7 @@ output version information and exit
 .SH SEE ALSO
 \fIlive\-initramfs\fR(7)
 .PP
-\fIlive\-sysvinit\fR(7)
+\fIlive\-initscripts\fR(7)
 .PP
 \fIlive\-webhelper\fR(7)
 
diff --git a/manpages/make-live.de.1 b/manpages/make-live.de.1
index bce03c438..d30cb0827 100644
--- a/manpages/make-live.de.1
+++ b/manpages/make-live.de.1
@@ -1,4 +1,4 @@
-.TH MAKE\-LIVE 1 "25.06.2007" "1.0~a16" "live\-helper"
+.TH MAKE\-LIVE 1 "02.07.2007" "1.0~a17" "live\-helper"
 
 .SH NAME
 make\-live \- erstellt ein Debian Live-System
diff --git a/manpages/make-live.en.1 b/manpages/make-live.en.1
index edc60f25e..dc4612518 100644
--- a/manpages/make-live.en.1
+++ b/manpages/make-live.en.1
@@ -1,4 +1,4 @@
-.TH MAKE\-LIVE 1 "2007\-06\-25" "1.0~a16" "live\-helper"
+.TH MAKE\-LIVE 1 "2007\-07\-02" "1.0~a17" "live\-helper"
 
 .SH NAME
 make\-live \- build a Debian Live system
diff --git a/templates/syslinux/isolinux.cfg b/templates/syslinux/isolinux.cfg
index 571914a88..733a5ebdb 100644
--- a/templates/syslinux/isolinux.cfg
+++ b/templates/syslinux/isolinux.cfg
@@ -14,11 +14,11 @@ F0 f10.txt
 
 DEFAULT live
 
-LIVE_LINUX_LIVE
+LINUX_LIVE
 
-LIVE_LINUX_INSTALL
+LINUX_INSTALL
 
-LIVE_MEMTEST
+MEMTEST
 
 #LABEL floppy
 #	localboot 0x00