Imported 2.580

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,18 @@
+livecd-rootfs (2.580) eoan; urgency=medium
+
+  * Run clean_debian_chroot after minimize_manual (LP: #1826377)
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Fri, 26 Apr 2019 10:30:15 +0200
+
+livecd-rootfs (2.579) eoan; urgency=medium
+
+  * Fix ubuntu-server-live images to generate initrd with casper
+    UUID. Whilst configs are sources, the variables are not exported into
+    the environment by default. Thus when casper hook is executed, it had
+    no idea that it should generate UUID.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 25 Apr 2019 17:07:10 +0100
+
 livecd-rootfs (2.578) disco; urgency=medium
 
   * Fix the sed script that Tobias had right in the first place and I

live-build/auto/build

@@ -308,8 +308,6 @@ EOF
 				apt-get -y --purge autoremove"
 		fi
 
-		clean_debian_chroot
-
 		if [ "${PROJECT}:${SUBPROJECT:-}" = "ubuntu-base:minimized" ]; then
 			# Save even more size by removing apt lists (that are currently removed
 			# downstream anyway)
@@ -427,6 +425,8 @@ EOF
 		echo END docdirs
 
 		/usr/share/livecd-rootfs/minimize-manual chroot
+
+		clean_debian_chroot
 	fi
 
 	if [ -n "${PASSES}" ]; then

live-build/lb_chroot_layered

@@ -244,8 +244,8 @@ create_chroot_pass () {
 	lb chroot_interactive ${*}
 
 	# Misc ubuntu cleanup and post-layer configuration
-	clean_debian_chroot
 	/usr/share/livecd-rootfs/minimize-manual chroot
+	clean_debian_chroot
 
 	Chroot chroot "dpkg-query -W" > chroot.packages.${pass}
 

live-build/ubuntu-server/hooks/033-kernel-bits.binary

@@ -56,7 +56,7 @@ for variant in $variants; do
 	if [ -n "$LB_INITRAMFS_COMPRESSION" ]; then
 		echo "COMPRESS=$LB_INITRAMFS_COMPRESSION" > "$KERNEL_BITS_ROOT"/etc/initramfs-tools/conf.d/livecd-rootfs.conf
 	fi
-	echo "CASPER_GENERATE_UUID=1" > "$KERNEL_BITS_ROOT"/etc/initramfs-tools/conf.d/casper.conf
+	echo "export CASPER_GENERATE_UUID=1" > "$KERNEL_BITS_ROOT"/etc/initramfs-tools/conf.d/casper.conf
 
 	# Add a hook to record which kernel was booted and mount the
 	# modules.squashfs created below.