Merge ~lihow731/ubuntu/+source/live-build:focal-devel into ubuntu/+source/live-build:ubuntu/focal-devel

[Leon Liao]

Add GENISOIMAGE_OPTIONS_EXTRA

Make the genisoimage option more flexible.

LP: 1864426

When we want to build a uefi bootable image, the mkisoimage needs extra options.
But, in live-build 3, the option of mkisoimage is fixed and can not be customized.

Unmerged commits

c050806... by Leon Liao on 2020-02-21

Add GENISOIMAGE_OPTIONS_EXTRA

Make the genisoimage option more flexible.

9d36b57... by Dimitri John Ledkov on 2019-06-05

Import patches-applied version 3.0~a57-1ubuntu38 to applied/ubuntu/eoan-proposed

Imported using git-ubuntu import.

Changelog parent: 45e2efdbc1d947019bcfcebab81b550f7a705c96
Unapplied parent: 27926ed23f5fcafd24bf6989b1d32c7691873417

New changelog entries:
  * Stop setting LB_INITRAMFS_COMPRESSION default, and instead fallback to
    using initramfs-tools default. LB_INITRAMFS_COMPRESSION is now only to
    override whatever initramfs-tools' default compression is. This thus
    makes live-build default to lz4. LP: #1831736

27926ed... by Dimitri John Ledkov on 2019-06-05

* Stop setting LB_INITRAMFS_COMPRESSION default, and instead fallback to

Gbp-Pq: drop-default-initramfs-compression-override.patch.

b72521c... by Dimitri John Ledkov on 2019-06-05

[PATCH] Handle includes.chroot files installed over symlinked

Gbp-Pq: 0001-Handle-includes.chroot-files-installed-over-symlinke.patch.

9d12091... by Dimitri John Ledkov on 2019-06-05

Use initramfs-tools to work with initrds instead of being silly.

Gbp-Pq: ubuntu-initramfs-handling.patch.

d969ea5... by Dimitri John Ledkov on 2019-06-05

Handle late installation of systemd/resolvconf gracefully, by not

Gbp-Pq: late-resolv.conf-symlink.patch.

e61dc04... by Dimitri John Ledkov on 2019-06-05

Stop using apt-key to setup secure apt, and instead copy the gpg key snippet.

Gbp-Pq: no-apt-key.patch.

96fbf54... by Dimitri John Ledkov on 2019-06-05

Don't force inclusion of gnupg in debootstrap

Gbp-Pq: ubuntu-no-gnupg-hardcode.patch.

42c721f... by Dimitri John Ledkov on 2019-06-05

Skip installing missing initrd

Gbp-Pq: skip-missing-initrd.patch.

b1d007f... by Dimitri John Ledkov on 2019-06-05

Drop fix-up code for sysvinit

Gbp-Pq: ubuntu-no-sysvinit-fixups.patch.

diff --git a/debian/changelog b/debian/changelog
index c604dbd..a17011a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+live-build (3.0~a57-1ubuntu39) focal; urgency=medium
+
+  * Add GENISOIMAGE_OPTIONS_EXTRA
+    Make the genisoimage option more flexible.
+
+ -- Li-Hao Liao (Leon Liao) <[e-mail]>  Fri, 21 Feb 2020 17:57:54 +0800
+
 live-build (3.0~a57-1ubuntu38) eoan; urgency=medium
 
   * Stop setting LB_INITRAMFS_COMPRESSION default, and instead fallback to
diff --git a/debian/patches/series b/debian/patches/series
index 525fa1f..a5d9dd3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -40,3 +40,4 @@ late-resolv.conf-symlink.patch
 ubuntu-initramfs-handling.patch
 0001-Handle-includes.chroot-files-installed-over-symlinke.patch
 drop-default-initramfs-compression-override.patch
+ubuntu-make-genisoimage-more-flexible.patch
diff --git a/debian/patches/ubuntu-make-genisoimage-more-flexible.patch b/debian/patches/ubuntu-make-genisoimage-more-flexible.patch
new file mode 100644
index 0000000..ccf861c
--- /dev/null
+++ b/debian/patches/ubuntu-make-genisoimage-more-flexible.patch
@@ -0,0 +1,31 @@
+Description: Make genisoimage more flexible.
+ Originally, we can not customize the opiton of the genisoimage. Now, the "GENISOIMAGE_OPTIONS_EXTRA" will be genisoimage option and make more flexible. This modification come from "live-build 2.0.12-2cesg34", but I can not find the git repository.
+Author: Li-Hao Liao (Leon Liao)
+Last-Update: 2020-02-21
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: live-build/scripts/build/lb_binary_iso
+===================================================================
+--- live-build.orig/scripts/build/lb_binary_iso
++++ live-build/scripts/build/lb_binary_iso
+@@ -193,7 +193,7 @@ fi
+ 
+ cat >> binary.sh << EOF
+ 
+-genisoimage ${GENISOIMAGE_OPTIONS} -o ${IMAGE} binary
++genisoimage ${GENISOIMAGE_OPTIONS} ${GENISOIMAGE_OPTIONS_EXTRA} -o ${IMAGE} binary
+ EOF
+ 
+ if [ "${LB_BINARY_IMAGES}" = "iso-hybrid" ]
+Index: live-build/scripts/build/lb_config
+===================================================================
+--- live-build.orig/scripts/build/lb_config
++++ live-build/scripts/build/lb_config
+@@ -1089,6 +1089,7 @@ APT_OPTIONS="${APT_OPTIONS}"
+ APTITUDE_OPTIONS="${APTITUDE_OPTIONS}"
+ GZIP_OPTIONS="${GZIP_OPTIONS}"
+ ISOHYBRID_OPTIONS="${ISOHYBRID_OPTIONS}"
++GENISOIMAGE_OPTIONS_EXTRA="${GENISOIMAGE_OPTIONS_EXTRA}"
+ EOF
+ 
+ # Creating lb_bootstrap_* configuration
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 08da782..713190b 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -220,8 +220,6 @@ Set_defaults ()
 			;;
 	esac
 
-	LB_INITRAMFS_COMPRESSION="${LB_INITRAMFS_COMPRESSION:-gzip}"
-
 	# Setting initsystem
 	case "${LB_MODE}" in
 		ubuntu|kubuntu)
@@ -377,14 +375,6 @@ Set_defaults ()
 		fi
 	fi
 
-	# Include packages on base
-	case "${LB_MODE}" in
-		ubuntu|kubuntu)
-			LB_BOOTSTRAP_INCLUDE="${LB_BOOTSTRAP_INCLUDE:-gnupg}"
-			;;
-
-	esac
-
 	# Exclude packages on base
 	# LB_BOOTSTRAP_EXCLUDE
 
@@ -596,7 +586,7 @@ Set_defaults ()
 					;;
 			esac
 
-			LB_PARENT_MIRROR_BINARY_VOLATILE="${LB_PARENT_MIRROR_BINARY_VOLATILE:-${LB_PARENT_MIRROR}}"
+			LB_PARENT_MIRROR_BINARY_VOLATILE="${LB_PARENT_MIRROR_BINARY_VOLATILE:-${LB_PARENT_MIRROR_BINARY}}"
 			;;
 
 		*)
@@ -702,6 +692,10 @@ Set_defaults ()
 
 	# Setting linux flavour string
 	case "${LB_ARCHITECTURES}" in
+		arm64)
+			# Assume we'll have a generic kernel for arm64 some day:
+			LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
+			;;
 		armel)
 			case "${LB_MODE}" in
                                 ubuntu|kubuntu)
@@ -748,7 +742,14 @@ Set_defaults ()
 					;;
 
 				ubuntu|kubuntu)
-					LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
+					case "${LB_DISTRIBUTION}" in
+						precise)
+							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic-pae}"
+							;;
+						*)
+							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
+							;;
+					esac
 					;;
 
 				*)
@@ -796,11 +797,11 @@ Set_defaults ()
 				ubuntu|kubuntu)
 					case "${LIST}" in
 						stripped|minimal)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc}"
+							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp}"
 							;;
 
 						*)
-							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc powerpc64-smp}"
+							LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp generic}"
 							;;
 					esac
 					;;
@@ -819,6 +820,14 @@ Set_defaults ()
 			esac
 			;;
 
+		ppc64el)
+			LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
+			;;
+
+		s390x)
+			LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
+			;;
+
 		s390)
 			case "${LB_MODE}" in
 				progress|ubuntu|kubuntu)
diff --git a/functions/losetup.sh b/functions/losetup.sh
index b62cc16..fb7ebef 100755
--- a/functions/losetup.sh
+++ b/functions/losetup.sh
@@ -68,7 +68,7 @@ Calculate_partition_size ()
 
 	case "${FILESYSTEM}" in
 		ext2|ext3|ext4)
-			PERCENT="5"
+			PERCENT="${LB_EXT_FUDGEFACTOR:-5}"
 			;;
 		*)
 			PERCENT="3"
diff --git a/functions/packagelists.sh b/functions/packagelists.sh
index 8a6141b..aad1ea2 100755
--- a/functions/packagelists.sh
+++ b/functions/packagelists.sh
@@ -43,7 +43,15 @@ Expand_packagelist ()
 				\!*)
 					_EXEC="$(echo ${_LB_LINE} | sed -e 's|^!||')"
 
-					chroot chroot ${_EXEC}
+					case "${LB_BUILD_WITH_CHROOT}" in
+						true)
+							chroot chroot sh -c "${_EXEC}"
+							;;
+
+						false)
+							eval ${_EXEC}
+							;;
+					esac
 					;;
 
 				\#if\ *)
diff --git a/functions/releases.sh b/functions/releases.sh
index 6871c12..78bf4fe 100755
--- a/functions/releases.sh
+++ b/functions/releases.sh
@@ -26,3 +26,6 @@ RELEASE_natty="11.04"		# 2012-10-01
 RELEASE_oneiric="11.10"		# 2013-04-01
 RELEASE_precise="12.04"		# LTS: 2017-04-01
 RELEASE_quantal="12.10"		# 2014-04-01
+RELEASE_raring="13.04"		# 2014-01-01
+RELEASE_saucy="13.10"		# 2014-07-01 
+RELEASE_trusty="14.04"		# LTS: 2019-04-01
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 667887a..1414075 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -362,7 +362,14 @@ then
 
 			case "${LB_MODE}" in
 				ubuntu|kubuntu)
-					DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic"
+					case "${LB_DISTRIBUTION}" in
+						precise)
+							DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic-pae"
+							;;
+						*)
+							DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic"
+							;;
+					esac
 					;;
 
 				*)
@@ -388,7 +395,7 @@ then
 			DI_REQ_PACKAGES="yaboot"
 			case "${LB_MODE}" in
 				ubuntu|kubuntu)
-					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc linux-image-powerpc64-smp"
+					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc-smp linux-image-generic"
 					;;
 
 				*)
diff --git a/scripts/build/lb_binary_disk b/scripts/build/lb_binary_disk
index ce11019..29ce048 100755
--- a/scripts/build/lb_binary_disk
+++ b/scripts/build/lb_binary_disk
@@ -97,24 +97,14 @@ case "${LB_INITRAMFS}" in
 		do
 			mkdir -p binary/uuid
 			cd binary/uuid
-
-			case "${LB_INITRAMFS_COMPRESSION}" in
-				gzip)
-					zcat "../../${INITRD}" | cpio --quiet -id conf/uuid.conf
-					;;
-
-				bzip2)
-					bzcat "../../${INITRD}" | cpio --quiet -id conf/uuid.conf
-					;;
-
-				lzma)
-					lzcat -S "" "../../${INITRD}" | cpio --quiet -id conf/uuid.conf
-					;;
-			esac
-
+			unmkinitramfs "../../${INITRD}" .
 			if [ -e conf/uuid.conf ]
 			then
 				mv conf/uuid.conf "../.disk/casper-uuid${INITRD#binary/casper/initrd.img}"
+			# Multipart gets extracted as early/main:
+			elif [ -e main/conf/uuid.conf ]
+			then
+				mv main/conf/uuid.conf "../.disk/casper-uuid${INITRD#binary/casper/initrd.img}"
 			else
 				Echo_warning "Failed to find casper uuid.conf in '${INITRD}'"
 			fi
diff --git a/scripts/build/lb_binary_hooks b/scripts/build/lb_binary_hooks
index 8018f79..a53330f 100755
--- a/scripts/build/lb_binary_hooks
+++ b/scripts/build/lb_binary_hooks
@@ -43,17 +43,18 @@ Create_lockfile .lock
 # Running hooks
 for _HOOK in ${LB_BINARY_HOOKS}
 do
-		for LOCATION in "${LIVE_BUILD}/hooks" /usr/share/live/build/hooks
+	for LOCATION in "${LIVE_BUILD}/hooks" /usr/share/live/build/hooks
+	do
+		for FILE in "${LOCATION}"/???-"${_HOOK}".binary
 		do
-			if [ -e "${LOCATION}/hooks/???-${_HOOK}.binary" ]
+			if [ -e "${FILE}" ]
 			then
 				cd binary
-				./"${LOCATION}/hooks/???-${_HOOK}.binary" || { Echo_error "${_HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;}
+				"${FILE}" || { Echo_error "${_HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;}
 				cd "${OLDPWD}"
-
-				continue
 			fi
 		done
+	done
 done
 
 ## Processing local hooks
diff --git a/scripts/build/lb_binary_includes b/scripts/build/lb_binary_includes
index c727395..80e905f 100755
--- a/scripts/build/lb_binary_includes
+++ b/scripts/build/lb_binary_includes
@@ -42,8 +42,12 @@ if Find_files config/includes.binary/
 then
 	# Copying includes
 	cd config/includes.binary
-	find . | cpio -dmpu --no-preserve-owner "${OLDPWD}"/binary
+	Echo_message "Creating a tarball with files from includes.binary..."
+	tar cf "${OLDPWD}"/binary/includes.binary.tar .
 	cd "${OLDPWD}"
+	Echo_message "Extracting the tarball in the chroot..."
+	tar -C binary -xvf binary/includes.binary.tar --no-same-owner --keep-directory-symlink --overwrite
+	rm binary/includes.binary.tar
 
 	# Removing symlinks
 	case "${LB_BINARY_IMAGES}" in
diff --git a/scripts/build/lb_binary_linux-image b/scripts/build/lb_binary_linux-image
index e36b54b..fb1c953 100755
--- a/scripts/build/lb_binary_linux-image
+++ b/scripts/build/lb_binary_linux-image
@@ -58,7 +58,7 @@ case "${LB_INITRAMFS}" in
 esac
 
 case "${LB_ARCHITECTURES}" in
-	powerpc)
+	powerpc|ppc64el)
 		LINUX="vmlinux"
 		;;
 
@@ -76,7 +76,7 @@ mkdir -p "${DESTDIR}"
 if [ "${LB_LINUX_PACKAGES}" != "none" ]
 then
 	cp chroot/boot/"${LINUX}"-* "${DESTDIR}"
-	cp chroot/boot/initrd.img-* "${DESTDIR}"
+	cp chroot/boot/initrd.img-* "${DESTDIR}" 2>&1 || Echo_message "Skipped installing missing initrd."
 fi
 
 case "${LB_INITRAMFS}" in
diff --git a/scripts/build/lb_binary_package-lists b/scripts/build/lb_binary_package-lists
index b3414ef..611b01f 100755
--- a/scripts/build/lb_binary_package-lists
+++ b/scripts/build/lb_binary_package-lists
@@ -41,15 +41,33 @@ Create_lockfile .lock
 if ls config/package-lists/*.list > /dev/null 2>&1 || \
    ls config/package-lists/*.list.binary > /dev/null 2>&1
 then
-	# Restoring cache
-	Restore_cache cache/packages.chroot
-
-	# Check depends
-	Check_package chroot/usr/bin/apt-ftparchive apt-utils
-	Check_package chroot/usr/bin/grep-aptavail dctrl-tools
-
-	# Installing depends
-	Install_package
+	case "${LB_BUILD_WITH_CHROOT}" in
+		true)
+			# Restoring cache
+			Restore_cache cache/packages.chroot
+
+			# Check depends
+			Check_package chroot/usr/bin/apt-ftparchive apt-utils
+			Check_package chroot/usr/bin/grep-aptavail dctrl-tools
+
+			# Installing depends
+			Install_package
+			;;
+
+		false)
+			if [ ! -e /usr/bin/apt-ftparchive ]; then
+				# apt-utils
+				Echo_error "/usr/bin/apt-ftparchive - no such file."
+				exit 1
+			fi
+
+			if [ ! -e /usr/bin/grep-aptavail ]; then
+				# dctrl-tools
+				Echo_error "/usr/bin/grep-aptavail - no such file."
+				exit 1
+			fi
+			;;
+	esac
 
 	if [ -e "${LIVE_BUILD}/share/bin/Packages" ]
 	then
@@ -133,11 +151,15 @@ then
 	rm -rf chroot/binary.deb
 	mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
 
-	# Removing depends
-	Remove_package
+	case "${LB_BUILD_WITH_CHROOT}" in
+		true)
+			# Removing depends
+			Remove_package
 
-	# Saving cache
-	Save_cache cache/packages.chroot
+			# Saving cache
+			Save_cache cache/packages.chroot
+			;;
+	esac
 
 	# Creating stage file
 	Create_stagefile .build/binary_package-lists
diff --git a/scripts/build/lb_binary_rootfs b/scripts/build/lb_binary_rootfs
index 860b600..81dbfdd 100755
--- a/scripts/build/lb_binary_rootfs
+++ b/scripts/build/lb_binary_rootfs
@@ -43,7 +43,7 @@ case "${LB_ARCHITECTURES}" in
 		LINUX="vmlinuz"
 		;;
 
-	powerpc)
+	powerpc|ppc64el)
 		LINUX="vmlinux"
 		;;
 esac
@@ -129,7 +129,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 					FAKE_MTAB="true"
 				fi
 
-				Chroot chroot "mkfs.${LB_CHROOT_FILESYSTEM} -F -b 1024 -N ${REAL_INODES} -m 0 filesystem.${LB_CHROOT_FILESYSTEM}"
+				Chroot chroot "mkfs.${LB_CHROOT_FILESYSTEM} -F -b ${LB_EXT_BLOCKSIZE:-1024} -i 8192 -m 0 -L ${LB_HDD_LABEL} ${LB_EXT_RESIZEBLOCKS:+-E resize=${LB_EXT_RESIZEBLOCKS}} filesystem.${LB_CHROOT_FILESYSTEM}"
 
 				mkdir -p filesystem.tmp
 				${LB_ROOT_COMMAND} mount -o loop chroot/filesystem.${LB_CHROOT_FILESYSTEM} filesystem.tmp
@@ -199,7 +199,7 @@ case "${LB_CHROOT_FILESYSTEM}" in
 
 			false)
 				dd if=/dev/zero of=binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM} bs=1024k count=0 seek=${REAL_DIM}
-				mkfs.${LB_CHROOT_FILESYSTEM} -F -b 1024 -N ${REAL_INODES} -m 0 binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM}
+				mkfs.${LB_CHROOT_FILESYSTEM} -F -b ${LB_EXT_BLOCKSIZE:-1024} -i 8192 -m 0 -L ${LB_HDD_LABEL} ${LB_EXT_RESIZEBLOCKS:+-E resize=${LB_EXT_RESIZEBLOCKS}} binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM}
 
 				mkdir -p filesystem.tmp
 				${LB_ROOT_COMMAND} mount -o loop binary/${INITFS}/filesystem.${LB_CHROOT_FILESYSTEM} filesystem.tmp
@@ -363,8 +363,15 @@ case "${LB_CHROOT_FILESYSTEM}" in
 				;;
 
 			*)
-				# FIXME: artax-backports too, once d-i has catched up
-				MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz"
+				case "${LB_MODE}" in
+					ubuntu|kubuntu)
+
+						;;
+					*)
+						# FIXME: artax-backports too, once d-i has catched up
+						MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz"
+						;;
+				esac
 				;;
 		esac
 
diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux
index 300841a..b441cdb 100755
--- a/scripts/build/lb_binary_syslinux
+++ b/scripts/build/lb_binary_syslinux
@@ -254,6 +254,13 @@ then
 	sed -i  -e "s|@LB_BOOTAPPEND_LIVE@|${LB_BOOTAPPEND_LIVE}|g" \
 		-e "s|@LB_BOOTAPPEND_FAILSAFE@|${LB_BOOTAPPEND_FAILSAFE}|g" \
 	${_TARGET}/live.cfg
+
+	case "${LB_INITRAMFS}" in
+		casper)
+			sed -i -e "s|boot=live|boot=casper|" \
+			    ${_SUFFIX}/live.cfg
+			;;
+	esac
 fi
 
 if [ -e ${_TARGET}/install.cfg ]
@@ -352,6 +359,22 @@ case "${LB_MODE}" in
 		;;
 esac
 
+# Hack around the removal of support in gfxboot for reading from outside
+# the bootlogo archive.  This makes customisation harder and is not ideal.
+tmpdir="$(mktemp -d)"
+(cd "$tmpdir" && cpio -i) < ${_TARGET}/bootlogo
+cp -a -f	${_TARGET}/*.fnt \
+		${_TARGET}/*.hlp \
+		${_TARGET}/*.jpg \
+		${_TARGET}/*.pcx \
+		${_TARGET}/*.tr \
+		${_TARGET}/*.cfg \
+		$(test -e ${_TARGET}/lang && echo ${_TARGET}/lang) \
+		${_TARGET}/langlist \
+		"$tmpdir/" || true
+(cd "$tmpdir" && ls -1 | cpio --quiet -o) > ${_TARGET}/bootlogo
+rm -rf "$tmpdir"
+
 case "${LB_BUILD_WITH_CHROOT}" in
 	true)
 		# Saving cache
diff --git a/scripts/build/lb_bootstrap_debootstrap b/scripts/build/lb_bootstrap_debootstrap
index d5865b6..7d08b61 100755
--- a/scripts/build/lb_bootstrap_debootstrap
+++ b/scripts/build/lb_bootstrap_debootstrap
@@ -84,7 +84,18 @@ case "${LB_USE_FAKEROOT}" in
 	false)
 		if [ -n "${LB_BOOTSTRAP_FLAVOUR}" ]
 		then
-			DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=${LB_BOOTSTRAP_FLAVOUR}"
+			case "${LB_BOOTSTRAP_FLAVOUR}" in
+				minimal)
+					DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=minbase"
+					;;
+
+				standard)
+					;;
+
+				*)
+					DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=${LB_BOOTSTRAP_FLAVOUR}"
+					;;
+			esac
 		fi
 		;;
 esac
diff --git a/scripts/build/lb_chroot b/scripts/build/lb_chroot
index ada67c3..5316af0 100755
--- a/scripts/build/lb_chroot
+++ b/scripts/build/lb_chroot
@@ -54,6 +54,7 @@ lb chroot_archives chroot install ${*}
 # Customizing chroot
 lb chroot_linux-image ${*}
 lb chroot_preseed ${*}
+lb chroot_early_hooks ${*}
 
 for _PASS in install live
 do
@@ -62,6 +63,12 @@ do
 
 	if [ "${_PASS}" = install ]
 	then
+		Chroot chroot "dpkg -l linux-headers-3* linux-headers-4*" 2>/dev/null \
+			| awk '/^i/ {print $2}' > chroot.headers
+		for i in $(cat chroot.headers); do
+			Chroot chroot "apt-mark auto $i"
+		done
+		Chroot chroot "apt-get --purge -y autoremove"
 		Chroot chroot "dpkg-query -W" > chroot.packages.install
 	fi
 done
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index 304480b..0894eb4 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -249,10 +249,10 @@ EOF
 					# Adding archive signing keys (chroot)
 					if [ -e "${_BASE}/archives/${REPOSITORY}.key.chroot" ]
 					then
-						cat "${_BASE}/archives/${REPOSITORY}.key.chroot" | Chroot chroot "apt-key add -"
+					    cp "${_BASE}/archives/${REPOSITORY}.key.chroot" chroot/etc/apt/trusted.gpg.d/${REPOSITORY}.gpg
 					elif [ -e "${_BASE}/archives/${REPOSITORY}.key" ]
 					then
-						cat "${_BASE}/archives/${REPOSITORY}.key" | Chroot chroot "apt-key add -"
+					    cp "${_BASE}/archives/${REPOSITORY}.key" chroot/etc/apt/trusted.gpg.d/${REPOSITORY}.gpg
 					fi
 				fi
 			done
@@ -291,7 +291,7 @@ EOF
 			do
 				if [ -e "${FILE}" ]
 				then
-					cp config/archives/$(basename ${_FILE} .chroot) chroot/etc/apt/preferences.d
+					cp ${FILE} chroot/etc/apt/preferences.d/$(basename ${FILE} .chroot)
 				fi
 			done
 		fi
@@ -516,9 +516,7 @@ EOF
 				do
 					if [ -e "${FILE}" ]
 					then
-						cp ${FILE} chroot/root
-						Chroot chroot "apt-key add /root/$(basename ${FILE})"
-						rm -f chroot/root/$(basename ${FILE})
+						cp ${FILE} chroot/etc/apt/trusted.gpg.d/$(basename ${FILE}).gpg
 					fi
 				done
 			fi
@@ -564,8 +562,8 @@ EOF
 			rm -rf chroot/var/cache/apt/*.bin
 
 			Apt chroot update
-			Apt chroot "upgrade"
-			Apt chroot "dist-upgrade"
+			Apt chroot "--force-yes" "upgrade"
+			Apt chroot "--force-yes" "dist-upgrade"
 
 			if [ "${LB_CACHE_INDICES}" = "true" ]
 			then
@@ -804,10 +802,10 @@ EOF
 					# Adding archive signing keys (binary)
 					if [ -e "${_BASE}/archives/${REPOSITORY}.key.binary" ]
 					then
-						cat "${_BASE}/archives/${REPOSITORY}.key.binary" | Chroot chroot "apt-key add -"
+						cp "${_BASE}/archives/${REPOSITORY}.key.binary" chroot/etc/apt/trusted.gpg.d/${REPOSITORY}.gpg
 					elif [ -e "${_BASE}/archives/${REPOSITORY}.key" ]
 					then
-						cat "${_BASE}/archives/${REPOSITORY}.key" | Chroot chroot "apt-key add -"
+						cat "${_BASE}/archives/${REPOSITORY}.key" chroot/etc/apt/trusted.gpg.d/${REPOSITORY}.gpg
 					fi
 				fi
 			done
@@ -846,7 +844,7 @@ EOF
 			do
 				if [ -e "${FILE}" ]
 				then
-					cp config/archives/$(basename ${_FILE} .binary) chroot/etc/apt/preferences.d
+					cp ${FILE} chroot/etc/apt/preferences.d/$(basename ${FILE} .binary)
 				fi
 			done
 		fi
diff --git a/scripts/build/lb_chroot_devpts b/scripts/build/lb_chroot_devpts
index 6cde4f4..e2af87f 100755
--- a/scripts/build/lb_chroot_devpts
+++ b/scripts/build/lb_chroot_devpts
@@ -49,7 +49,7 @@ case "${1}" in
 			mkdir -p chroot/dev/pts
 
 			# Mounting /dev/pts
-			${LB_ROOT_COMMAND} mount devpts-live -t devpts chroot/dev/pts || true
+			${LB_ROOT_COMMAND} mount devpts-live -t devpts -o gid=5,mode=620 chroot/dev/pts || true
 		fi
 
 		# Creating stage file
diff --git a/scripts/build/lb_chroot_dpkg b/scripts/build/lb_chroot_dpkg
index e2f76ad..1cdcc29 100755
--- a/scripts/build/lb_chroot_dpkg
+++ b/scripts/build/lb_chroot_dpkg
@@ -40,10 +40,8 @@ case "${1}" in
 		# Creating lock file
 		Create_lockfile .lock
 
-		# Save start-stop-daemon program
-		mv chroot/sbin/start-stop-daemon chroot/sbin/start-stop-daemon.orig
-
-		# Create start-stop-daemon program
+		# Create custom start-stop-daemon program
+		Chroot chroot dpkg-divert --rename --quiet --add /sbin/start-stop-daemon
 
 cat > chroot/sbin/start-stop-daemon << EOF
 #!/bin/sh
@@ -103,11 +101,9 @@ EOF
 			rmdir --ignore-fail-on-non-empty /var/state/samhain || true
 		fi
 
-		# Restore start-stop-daemon program
-		if [ -e chroot/sbin/start-stop-daemon.orig ]
-		then
-			mv chroot/sbin/start-stop-daemon.orig chroot/sbin/start-stop-daemon
-		fi
+		# Remove custom start-stop-daemon program
+		rm -f chroot/sbin/start-stop-daemon
+		Chroot chroot dpkg-divert --rename --quiet --remove /sbin/start-stop-daemon
 
 		# Remove dpkg sync configuration
 		rm -f chroot/etc/dpkg/dpkg.cfg.d/live-build
diff --git a/scripts/build/lb_chroot_early_hooks b/scripts/build/lb_chroot_early_hooks
new file mode 100644
index 0000000..dcbaa65
--- /dev/null
+++ b/scripts/build/lb_chroot_early_hooks
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+## live-build(7) - System Build Scripts
+## Copyright (C) 2006-2012 Daniel Baumann <[e-mail]>
+##
+## This program 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
+( . "${LIVE_BUILD}/scripts/build.sh" > /dev/null 2>&1 || true ) || . /usr/lib/live/build.sh
+
+# Setting static variables
+DESCRIPTION="$(Echo 'execute hooks in chroot (early stage)')"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+# Reading configuration files
+Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
+Set_defaults
+
+Echo_message "Begin executing early chroot hooks..."
+
+# Requiring stage file
+Require_stagefile .build/config .build/bootstrap
+
+# Checking stage file
+Check_stagefile .build/chroot_early_hooks
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+## Processing local hooks
+if Find_files config/hooks/*.chroot_early
+then
+	# Restoring cache
+	Restore_cache cache/packages.chroot
+
+	for _HOOK in config/hooks/*.chroot_early
+	do
+		# Copying hook
+		cp "${_HOOK}" chroot/root
+
+		# Making hook executable
+		if [ ! -x chroot/root/"$(basename ${_HOOK})" ]
+		then
+			chmod +x chroot/root/"$(basename ${_HOOK})"
+		fi
+
+		# Executing hook
+		Chroot chroot "/root/$(basename ${_HOOK})" || { Echo_error "${_HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;}
+
+		# Removing hook
+		rm -f chroot/root/"$(basename ${_HOOK})"
+	done
+
+	# Saving cache
+	Save_cache cache/packages.chroot
+
+	# Creating stage file
+	Create_stagefile .build/chroot_early_hooks
+fi
diff --git a/scripts/build/lb_chroot_hacks b/scripts/build/lb_chroot_hacks
index 06bfe50..4e8d39e 100755
--- a/scripts/build/lb_chroot_hacks
+++ b/scripts/build/lb_chroot_hacks
@@ -176,45 +176,28 @@ case "${LB_INITRAMFS}" in
 		;;
 esac
 
+case "${SUBPROJECT}" in
+	wubi)
+		UPDATE_INITRAMFS_OPTIONS="$UPDATE_INITRAMFS_OPTIONS FRAMEBUFFER=y"
+		;;
+esac
+
 if [ "${LB_INITRAMFS}" != "none" ]
 then
+	if [ -n "${LB_INITRAMFS_COMPRESSION}" ]; then
+		echo "COMPRESS=${LB_INITRAMFS_COMPRESSION}" \
+			> chroot/etc/initramfs-tools/conf.d/live-build.conf
+	fi
 	Chroot chroot "${UPDATE_INITRAMFS_OPTIONS} update-initramfs -k all -t -u"
+	rm -f chroot//etc/initramfs-tools/conf.d/live-build.conf
 fi
 
-# We probably ought to use COMPRESS= in a temporary file in
-# /etc/initramfs-tools/conf.d/ instead, but it's hard to pass options that
-# way.
-case "${LB_INITRAMFS_COMPRESSION}" in
-	gzip)
-		;;
-
-	bzip2)
-		for INITRAMFS in $(find chroot/boot -name 'initrd*'); do
-			zcat "${INITRAMFS}" | bzip2 -c ${BZIP2_OPTIONS} > "${INITRAMFS}.new"
-			mv "${INITRAMFS}.new" "${INITRAMFS}"
-		done
-		;;
-
-	lzma)
-		# We probably ought to use COMPRESS= in a temporary file in
-		# /etc/initramfs-tools/conf.d/ instead, but it's hard to
-		# pass options that way.
-		for INITRAMFS in $(find chroot/boot -name 'initrd*'); do
-			zcat "${INITRAMFS}" | lzma -c ${LZMA_OPTIONS} > "${INITRAMFS}.new"
-			mv "${INITRAMFS}.new" "${INITRAMFS}"
-		done
-		;;
-esac
-
 # Ensure readable permissions on initramfs. loop-aes-utils sets umask to
 # protect GPG keys, which live-build does not support.
 # Note: Use find rather than chmod on the wildcard, one never knows what
 # people might do in local hooks, and there might be no initrds at all.
 find chroot/boot -name 'initrd*' -print0 | xargs -r -0 chmod go+r
 
-# Remove build systems clock drift
-echo "0.0 0 0.0" > chroot/etc/adjtime
-
 # Remove cruft
 rm -f chroot/boot/initrd*bak*
 rm -f chroot/etc/apt/trusted.gpg~
@@ -223,6 +206,7 @@ rm -f chroot/etc/gshadow- chroot/etc/shadow-
 rm -f chroot/var/cache/debconf/*-old
 rm -f chroot/var/lib/dpkg/*-old
 rm -f chroot/var/log/apt/term.log
+rm -f chroot/etc/adjtime
 
 # Delete and re-create temporary directories
 TEMP_DIRS="/tmp /var/tmp"
@@ -271,7 +255,7 @@ then
 	done
 
 	# Config files which need to be RW
-	COW_FILES="/etc/adjtime /etc/fstab /etc/hostname /etc/hosts /etc/live.conf /etc/network/interfaces /etc/resolv.conf /etc/udev/rules.d/*persistent-net.rules /etc/udev/rules.d/*persistent-cd.rules /etc/X11/xorg.conf"
+	COW_FILES="/etc/fstab /etc/hostname /etc/hosts /etc/live.conf /etc/network/interfaces /etc/resolv.conf /etc/udev/rules.d/*persistent-net.rules /etc/udev/rules.d/*persistent-cd.rules /etc/X11/xorg.conf"
 
 	# Where we will store RW config files
 	RW_DIRECTORY="/var/lib/live"
diff --git a/scripts/build/lb_chroot_hooks b/scripts/build/lb_chroot_hooks
index 368e922..71f123c 100755
--- a/scripts/build/lb_chroot_hooks
+++ b/scripts/build/lb_chroot_hooks
@@ -54,12 +54,14 @@ for _HOOK in ${LB_CHROOT_HOOKS}
 do
 	for LOCATION in "${LIVE_BUILD}/hooks" /usr/share/live/build/hooks
 	do
-		if [ -e "${LOCATION}/hooks/???-${_HOOK}.binary" ]
-		then
-			mkdir -p chroot/root/lb_chroot_hooks
-			cp "${LOCATION}"/hooks/???-"${_HOOK}".chroot chroot/root/lb_chroot_hooks
-			continue
-		fi
+		for FILE in "${LOCATION}"/???-"${_HOOK}".chroot
+		do
+			if [ -e "${FILE}" ]
+			then
+				mkdir -p chroot/root/lb_chroot_hooks
+				cp "${FILE}" chroot/root/lb_chroot_hooks
+			fi
+		done
 	done
 done
 
diff --git a/scripts/build/lb_chroot_hostname b/scripts/build/lb_chroot_hostname
index 28cb501..2c88b41 100755
--- a/scripts/build/lb_chroot_hostname
+++ b/scripts/build/lb_chroot_hostname
@@ -29,8 +29,6 @@ Require_stagefile .build/config .build/bootstrap
 
 case "${1}" in
 	install)
-		Echo_message "Configuring file /etc/hostname"
-
 		# Checking stage file
 		Check_stagefile .build/chroot_hostname
 
@@ -40,15 +38,15 @@ case "${1}" in
 		# Creating lock file
 		Create_lockfile .lock
 
-		# Save hostname
-		mv chroot/bin/hostname chroot/bin/hostname.orig
-
 		# Create hostname file
+		Echo_message "Configuring file /etc/hostname"
+
 		echo "localhost.localdomain" > chroot/etc/hostname
 
+		# Create custom hostname
 		Echo_message "Configuring file /bin/hostname"
 
-		# Create hostname program
+		Chroot chroot dpkg-divert --rename --quiet --add /bin/hostname
 
 cat > chroot/bin/hostname << EOF
 #!/bin/sh
@@ -79,11 +77,9 @@ EOF
 
 		Echo_message "Deconfiguring file /bin/hostname"
 
-		# Restore hostname file
-		if [ -e chroot/bin/hostname.orig ]
-		then
-			mv chroot/bin/hostname.orig chroot/bin/hostname
-		fi
+		# Remove custom hostname
+		rm -f chroot/bin/hostname
+		Chroot chroot dpkg-divert --rename --quiet --remove /bin/hostname
 
 		# Removing stage file
 		rm -f .build/chroot_hostname
diff --git a/scripts/build/lb_chroot_includes b/scripts/build/lb_chroot_includes
index ba31d5c..d946f5f 100755
--- a/scripts/build/lb_chroot_includes
+++ b/scripts/build/lb_chroot_includes
@@ -42,8 +42,12 @@ if Find_files config/includes.chroot/
 then
 	# Copying includes
 	cd config/includes.chroot
-	find . | cpio -dmpu --no-preserve-owner "${OLDPWD}"/chroot
+	Echo_message "Creating a tarball with files from includes.chroot..."
+	tar cf "${OLDPWD}"/chroot/includes.chroot.tar .
 	cd "${OLDPWD}"
+	Echo_message "Extracting the tarball in the chroot..."
+	Chroot chroot "tar -xvf includes.chroot.tar --no-same-owner --keep-directory-symlink --overwrite"
+	rm chroot/includes.chroot.tar
 
 	# Creating stage file
 	Create_stagefile .build/chroot_includes
diff --git a/scripts/build/lb_chroot_linux-image b/scripts/build/lb_chroot_linux-image
index e2ca830..0244933 100755
--- a/scripts/build/lb_chroot_linux-image
+++ b/scripts/build/lb_chroot_linux-image
@@ -118,6 +118,24 @@ EOF
 
 	fi
 
+	cat > chroot/etc/kernel-img.conf << EOF
+# Kernel Image management overrides
+# See kernel-img.conf(5) for details
+do_symlinks = yes
+do_bootloader = no
+EOF
+
+	case "${LB_ARCHITECTURES}" in
+		alpha|amd64|hppa|i386|ia64|m68k|mips|mipsel)
+			;;
+
+		*)
+			cat >> chroot/etc/kernel-img.conf << EOF
+link_in_boot = yes
+EOF
+			;;
+	esac
+
 	# Creating stage file
 	Create_stagefile .build/chroot_linux-image
 fi
diff --git a/scripts/build/lb_chroot_live-packages b/scripts/build/lb_chroot_live-packages
index 0e4ff44..e8ba0a1 100755
--- a/scripts/build/lb_chroot_live-packages
+++ b/scripts/build/lb_chroot_live-packages
@@ -48,20 +48,6 @@ then
 	_PACKAGES="${_PACKAGES} live-config live-config-${LB_INITSYSTEM}"
 fi
 
-# Do initsystem specific hacks
-if [ -n "${LB_INITSYSTEM}" ] && [ "${LB_INITSYSTEM}" != "sysvinit" ]
-then
-	# lets see if we still need the squeeze's "pre init system policy discussion" hack:
-	IS_SYSVINIT_ESSENTIAL="$(Chroot chroot dpkg-query --show --showformat='${Essential}\n' sysvinit)"
-	RC="$?"
-
-	if [ "${IS_SYSVINIT_ESSENTIAL}" != "no" ] && [ "${RC}" = "0" ]
-	then
-		# sysvinit is both installed and essential, ugly hack to remove it
-		Chroot chroot dpkg --force-remove-essential --remove sysvinit || true
-	fi
-fi
-
 # Install live packages
 if [ -n "${_PACKAGES}" ]
 then
diff --git a/scripts/build/lb_chroot_package-lists b/scripts/build/lb_chroot_package-lists
index e2dabb1..eba1cbe 100755
--- a/scripts/build/lb_chroot_package-lists
+++ b/scripts/build/lb_chroot_package-lists
@@ -46,14 +46,26 @@ if ls config/package-lists/*.list > /dev/null 2>&1 || \
    ls config/package-lists/*.list.chroot > /dev/null 2>&1 || \
    ls config/package-lists/*.list.chroot_${_PASS} > /dev/null 2>&1
 then
-	# Checking depends
-	Check_package chroot/usr/bin/grep-aptavail dctrl-tools
-
-	# Restoring cache
-	Restore_cache cache/packages.chroot
-
-	# Installing depends
-	Install_package
+	case "${LB_BUILD_WITH_CHROOT}" in
+		true)
+			# Checking depends
+			Check_package chroot/usr/bin/grep-aptavail dctrl-tools
+
+			# Restoring cache
+			Restore_cache cache/packages.chroot
+
+			# Installing depends
+			Install_package
+			;;
+
+		false)
+			if [ ! -e /usr/bin/grep-aptavail ]; then
+				# dctrl-tools
+				Echo_error "/usr/bin/grep-aptavail - no such file."
+				exit 1
+			fi
+			;;
+	esac
 
 	if [ -e "${LIVE_BUILD}/share/bin/Packages" ]
 	then
@@ -76,15 +88,19 @@ then
 
 	rm -f chroot/bin/Packages
 
-	# Removing dctrl-tools again if the user has not installed it
-	if ! grep -qs dctrl-tools chroot/root/packages.chroot
-	then
-		# Removing depends
-		Remove_package
-	fi
-
-	# Saving cache
-	Save_cache cache/packages.binary
+	case "${LB_BUILD_WITH_CHROOT}" in
+		true)
+			# Removing dctrl-tools again if the user has not installed it
+			if ! grep -qs dctrl-tools chroot/root/packages.chroot
+			then
+				# Removing depends
+				Remove_package
+			fi
+
+			# Saving cache
+			Save_cache cache/packages.binary
+			;;
+	esac
 
 	# Creating stage file
 	Create_stagefile .build/chroot_package-lists.${_PASS}
diff --git a/scripts/build/lb_chroot_resolv b/scripts/build/lb_chroot_resolv
index 417c412..438bae0 100755
--- a/scripts/build/lb_chroot_resolv
+++ b/scripts/build/lb_chroot_resolv
@@ -76,11 +76,20 @@ case "${1}" in
 		# Creating lock file
 		Create_lockfile .lock
 
-		if [ -e config/includes.chroot/etc/resolv.conf ]
+		if [ -e config/includes.chroot/etc/resolv.conf ] ||  [ -L config/includes.chroot/etc/resolv.conf ];
 		then
 			# Copying local resolv.conf
 			cp -a config/includes.chroot/etc/resolv.conf chroot/etc/resolv.conf
 			rm -f chroot/etc/resolv.conf.orig
+		elif [ -L chroot/etc/resolv.conf ] && [ -e chroot/etc/resolv.conf.orig ]
+		then
+			# After debootstrap (which copied resolv.conf from
+			# the host) and after we backed that up, something
+			# converted /etc/resolv.conf into a
+			# symlink. E.g. a late installation of
+			# systemd-resolved or resolvconf. Do not touch the
+			# new symlink, but do clean up our backup.
+			rm -f chroot/etc/resolv.conf.orig
 		elif [ -e chroot/etc/resolv.conf.orig ] || [ -L chroot/etc/resolv.conf.orig ]
 		then
 			# Restoring resolv file or symlink
@@ -90,6 +99,12 @@ case "${1}" in
 			Truncate chroot/etc/resolv.conf
 		fi
 
+		# Clean up resolvconf's pollution
+		if [ -d chroot/etc/resolvconf/resolv.conf.d ]; then
+			rm -f chroot/etc/resolvconf/resolv.conf.d/original
+			rm -f chroot/etc/resolvconf/resolv.conf.d/tail
+		fi
+
 		# Removing stage file
 		rm -f .build/chroot_resolv
 		;;
diff --git a/scripts/build/lb_chroot_sysv-rc b/scripts/build/lb_chroot_sysv-rc
index 94db1ca..c070a25 100755
--- a/scripts/build/lb_chroot_sysv-rc
+++ b/scripts/build/lb_chroot_sysv-rc
@@ -40,10 +40,10 @@ case "${1}" in
 		# Creating lock file
 		Create_lockfile .lock
 
-		if [ -f chroot/usr/sbin/policy-rc.d ]
+		if [ -e chroot/usr/sbin/policy-rc.d ]
 		then
 			# Save policy-rc.d file
-			mv chroot/usr/sbin/policy-rc.d chroot/usr/sbin/policy-rc.d.orig
+			Chroot chroot dpkg-divert --rename --quiet --add /usr/sbin/policy-rc.d
 		fi
 
 		# Create policy-rc.d file
@@ -68,13 +68,13 @@ EOF
 		# Creating lock file
 		Create_lockfile .lock
 
-		if [ -f chroot/usr/sbin/policy-rc.d.orig ]
+		# Remove custom policy-rc.d file
+		rm -f chroot/usr/sbin/policy-rc.d
+
+		if [ -e chroot/usr/sbin/policy-rc.d.distrib ]
 		then
 			# Restore policy-rc.d file
-			mv chroot/usr/sbin/policy-rc.d.orig chroot/usr/sbin/policy-rc.d
-		else
-			# Remove policy-rc.d file
-			rm -f chroot/usr/sbin/policy-rc.d
+			Chroot chroot dpkg-divert --rename --quiet --remove /usr/sbin/policy-rc.d
 		fi
 
 		# Removing stage file
diff --git a/scripts/build/lb_chroot_upstart b/scripts/build/lb_chroot_upstart
index ea22549..8b7c1c4 100755
--- a/scripts/build/lb_chroot_upstart
+++ b/scripts/build/lb_chroot_upstart
@@ -40,13 +40,11 @@ case "${1}" in
 		# Creating lock file
 		Create_lockfile .lock
 
-		if [ -f chroot/sbin/initctl ]
-		then
-			# Save initctl file
-			mv chroot/sbin/initctl chroot/sbin/initctl.orig
-		fi
+		# Create custom initctl file
+		Chroot chroot dpkg-divert --rename --quiet --add /sbin/initctl
 
-		# Create initctl file
+		# Only create stub if we actually diverted something
+		if [ -e chroot/sbin/initctl.distrib ]; then
 cat > chroot/sbin/initctl << EOF
 #!/bin/sh
 echo "All runlevel operations denied by policy" >&2
@@ -54,6 +52,7 @@ exit 101
 EOF
 
 		chmod 0755 chroot/sbin/initctl
+		fi
 
 		# Creating stage file
 		Create_stagefile .build/chroot_upstart
@@ -68,14 +67,9 @@ EOF
 		# Creating lock file
 		Create_lockfile .lock
 
-		if [ -f chroot/sbin/initctl.orig ]
-		then
-			# Restore initctl file
-			mv chroot/sbin/initctl.orig chroot/sbin/initctl
-		else
-			# Remove initctl file
-			rm -f chroot/sbin/initctl
-		fi
+		# Remove custom initctl file
+		rm -f chroot/sbin/initctl
+		Chroot chroot dpkg-divert --rename --quiet --remove /sbin/initctl
 
 		# Removing stage file
 		rm -f .build/chroot_upstart
diff --git a/scripts/build/lb_clean b/scripts/build/lb_clean
index 4b7c23b..e500a8c 100755
--- a/scripts/build/lb_clean
+++ b/scripts/build/lb_clean
@@ -88,6 +88,7 @@ do
 			${LB_ROOT_COMMAND} rm -rf chroot chroot.tmp
 
 			rm -f chroot.packages.live chroot.packages.install
+			rm -f chroot.headers
 
 			rm -f .build/chroot*
 			;;
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 8dbd0b8..ebfa47d 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -57,6 +57,9 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--debian-installer-gui true|false]\n\
 \t    [--debug]\n\
 \t    [-d|--distribution CODENAME]\n\
+\t    [--ext-block-size 1024|2048|4096]\n\
+\t    [--ext-resize-blocks N]\n\
+\t    [--ext-fudge-factor PERCENTAGE]\n\
 \t    [--parent-distribution CODENAME]\n\
 \t    [--parent-debian-installer-distribution CODENAME]\n\
 \t    [--dump]\n\
@@ -157,7 +160,7 @@ Local_arguments ()
 		apt-indices:,bootappend-install:,bootappend-live:,bootappend-failsafe:,bootloader:,checksums:,compression:,config:,zsync:,build-with-chroot:,
 		debian-installer:,debian-installer-distribution:,debian-installer-preseedfile:,debian-installer-gui:,
 		grub-splash:,isohybrid-options:,hdd-label:,hdd-size:,iso-application:,iso-preparer:,iso-publisher:,
-		iso-volume:,jffs2-eraseblock:,memtest:,net-root-filesystem:,net-root-mountoptions:,
+		iso-volume:,jffs2-eraseblock:,ext-block-size:,ext-resize-blocks:,ext-fudge-factor:,memtest:,net-root-filesystem:,net-root-mountoptions:,
 		net-root-path:,net-root-server:,net-cow-filesystem:,net-cow-mountoptions:,net-cow-path:,
 		net-cow-server:,net-tarball:,firmware-binary:,firmware-chroot:,swap-file-path:,swap-file-size:,syslinux-theme:,
 		win32-loader:,source:,source-images:,breakpoints,conffile:,debug,force,
@@ -683,6 +686,21 @@ Local_arguments ()
 				shift 2
 				;;
 
+			--ext-block-size)
+				LB_EXT_BLOCKSIZE="${2}"
+				shift 2
+				;;
+
+			--ext-resize-blocks)
+				LB_EXT_RESIZEBLOCKS="${2}"
+				shift 2
+				;;
+
+			--ext-fudge-factor)
+				LB_EXT_FUDGEFACTOR="${2}"
+				shift 2
+				;;
+
 			--jffs2-eraseblock)
 				LB_JFFS2_ERASEBLOCK="${2}"
 				shift 2
@@ -1392,6 +1410,18 @@ LB_ISO_PUBLISHER="${LB_ISO_PUBLISHER}"
 # (Default: ${LB_ISO_VOLUME})
 LB_ISO_VOLUME="${LB_ISO_VOLUME}"
 
+# \$LB_EXT_BLOCKSIZE: set EXT block size
+# (Default: unset)
+LB_EXT_BLOCKSIZE="${LB_EXT_BLOCKSIZE}"
+
+# \$LB_EXT_RESIZEBLOCKS: set EXT resize parameter
+# (Default: unset)
+LB_EXT_RESIZEBLOCKS="${LB_EXT_RESIZEBLOCKS}"
+
+# \$LB_EXT_FUDGEFACTOR: set extra size of EXT images (in %)
+# (Default: unset)
+LB_EXT_FUDGEFACTOR="${LB_EXT_FUDGEFACTOR}"
+
 # \$LB_JFFS2_ERASEBLOCK: set jffs2 eraseblock size
 # (Default: unset)
 LB_JFFS2_ERASEBLOCK=""
diff --git a/share/hooks/004-remove-dbus-machine-id.chroot b/share/hooks/004-remove-dbus-machine-id.chroot
index 230099e..6beac3b 100755
--- a/share/hooks/004-remove-dbus-machine-id.chroot
+++ b/share/hooks/004-remove-dbus-machine-id.chroot
@@ -7,3 +7,6 @@ set -e
 # This removes dbus machine id that cache that makes each system unique.
 
 rm -f /var/lib/dbus/machine-id
+
+# truncate, do not remove otherwise systemd is unhappy
+printf "" > /etc/machine-id
diff --git a/share/hooks/100-build-wubildr.binary b/share/hooks/100-build-wubildr.binary
new file mode 100644
index 0000000..66d1944
--- /dev/null
+++ b/share/hooks/100-build-wubildr.binary
@@ -0,0 +1,36 @@
+#! /bin/sh
+
+set -e
+
+# Build the wubildr bootloader for Wubi.
+
+cd ..
+CHROOT="$(mktemp -d)"
+# grub-mkimage needs to be able to find the source file of the loopback image
+# in the location that losetup knows it is; however, in a chroot this file wont
+# be present, so we need to make it so by the magic of bind mounts:
+mkdir -p "ubuntu/disks"
+# FIXME: swap these next two lines around when the buildds can handle ext4:
+# mv "binary/boot/filesystem.ext4" "ubuntu/disks/root.disk"
+mv "binary/boot/filesystem.ext3" "ubuntu/disks/root.disk"
+mount -o loop "ubuntu/disks/root.disk" "$CHROOT"
+# Save the directory structure mkdir created, so that it can be removed later.
+REMOVE="$(mkdir -pv "$CHROOT$PWD" | head -n1 | sed "s,.*\`\(.*\)',\1,")"
+mount -o bind "$PWD" "$CHROOT$PWD"
+chroot "$CHROOT" mount -t proc proc /proc
+# Expected to already exist.
+touch wubildr
+# grub-install cries unless you point it at something.
+chroot "$CHROOT" grub-install /dev/null
+umount "$CHROOT/proc"
+umount "$CHROOT$PWD"
+rm -rf "$REMOVE"
+# /host is normally created by partman-auto-loop.
+mkdir "$CHROOT/host"
+umount "$CHROOT"
+mv wubildr binary/boot
+# Link output files somewhere BuildLiveCD will be able to find them.
+PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}"
+mv ubuntu/disks/root.disk binary/boot/root.disk
+rmdir -p ubuntu/disks
+tar cf - -C binary/boot root.disk wubildr | xz -9 > "$PREFIX.tar.xz"