Imported 2.606

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,11 @@
+livecd-rootfs (2.606) eoan; urgency=medium
+
+  * Undivert update-initramfs more carefully: previously the wrapper script
+    and diversion were left in place on images such as buildd images that
+    don't have initramfs-tools installed (LP: #1841573).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Tue, 27 Aug 2019 17:05:32 +0100
+
 livecd-rootfs (2.605) eoan; urgency=medium
 
   [ David Krauser ]

live-build/auto/build

@@ -284,6 +284,7 @@ EOF
 		divert_grub chroot
 		divert_update_initramfs
 		lb chroot "$@"
+		undivert_update_initramfs
 		undivert_grub chroot
 	fi
 

live-build/functions

@@ -875,13 +875,12 @@ echo "update-initramfs: diverted by livecd-rootfs (will be called later)" >&2
 exit 0
 EOF
 	chmod +x chroot/usr/sbin/update-initramfs
+}
 
-	cat > config/hooks/999-undivert-update-initramfs.chroot <<'EOF'
-#! /bin/sh
-[ ! -f /usr/sbin/update-initramfs.REAL ] && exit 0
-rm -f /usr/sbin/update-initramfs
-dpkg-divert --quiet --remove --rename /usr/sbin/update-initramfs
-EOF
+undivert_update_initramfs () {
+	rm -f chroot/usr/sbin/update-initramfs
+	Chroot chroot "dpkg-divert --quiet --remove --rename \
+		/usr/sbin/update-initramfs"
 }
 
 is_root_layer () {

live-build/lb_chroot_layered

@@ -249,9 +249,6 @@ create_chroot_pass () {
 
 	Chroot chroot "dpkg-query -W" > chroot.packages.${pass}
 
-	# Restore grub
-	undivert_grub chroot
-
 	# Deconfiguring chroot
 	if $(is_root_layer $pass); then
 		lb chroot_archives chroot remove ${*}
@@ -263,6 +260,15 @@ create_chroot_pass () {
 	lb chroot_tmpfs remove ${*}
 	lb chroot_dpkg remove ${*}
 	lb chroot_debianchroot remove ${*}
+
+	# Restore update-initramfs, if necessary
+	if $(is_root_layer $pass); then
+		undivert_update_initramfs
+	fi
+
+	# Restore grub
+	undivert_grub chroot
+
 	lb chroot_sysfs remove ${*}
 	lb chroot_proc remove ${*}
 	lb chroot_devpts remove ${*}