Merge branch 'minimize-manual-earlier' of lp:~juliank/livecd-rootfs into ubuntu/master

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.580) UNRELEASED; urgency=medium
+
+  * Run clean_debian_chroot after minimize_manual (LP: #1826377)
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Thu, 25 Apr 2019 11:43:11 +0200
+
 livecd-rootfs (2.579) eoan; urgency=medium
 
   * Fix ubuntu-server-live images to generate initrd with casper

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}