Imported 2.611

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.611) eoan; urgency=medium
+
+  * Execute chroot_hacks in live layer only.
+  * lb_chroot_layered: also snap_validate_seed after all snaps are seeded
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Fri, 13 Sep 2019 12:37:25 +0100
+
 livecd-rootfs (2.610) eoan; urgency=medium
 
   * Fix a typo in the 999-ubuntu-image-customization.chroot hook.

live-build/lb_chroot_layered

@@ -89,8 +89,9 @@ lb_chroot_install_snaps () {
 	snap_prepare chroot
 
 	while read snap; do
-		snap_preseed chroot "${snap}"
+		SNAP_NO_VALIDATE_SEED=1 snap_preseed chroot "${snap}"
 	done < $snaplist_file
+	snap_validate_seed chroot
 }
 
 lb_chroot_includes () {
@@ -239,7 +240,9 @@ create_chroot_pass () {
 	# layered mode is to create an initrd on each layer with a significant
 	# impact on image size (+30MB per layer). This is an issue even with
 	# update-initramfs disabled.
-	lb chroot_hacks ${*}
+	if $(is_live_layer $pass); then
+		lb chroot_hacks ${*}
+	fi
 
 	lb chroot_interactive ${*}