From 67dab61787a05ac9f890563c631c36487a442872 Mon Sep 17 00:00:00 2001
From: Christopher Glass <christopher.glass@canonical.com>
Date: Fri, 10 Nov 2017 18:41:57 +0100
Subject: [PATCH] Backport "minimized round 2" changes from trunk to Xenial
 (LP: #1731492)

---
 debian/changelog                              |  6 ++++++
 live-build/auto/build                         |  4 ++++
 live-build/auto/config                        |  1 +
 .../ubuntu-cpc/hooks/999-cpc-fixes.chroot     | 21 +++++++++++++++++++
 4 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 66fb3545..b62f3d4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (2.408.24) UNRELEASED; urgency=medium
+
+  * Backport "minimized round 2" changes from trunk to Xenial (LP: #1731492)
+
+ -- Christopher Glass (Ubuntu) <tribaal@ubuntu.com>  Fri, 10 Nov 2017 18:39:52 +0100
+
 livecd-rootfs (2.408.23) UNRELEASED; urgency=medium
 
   [ Gary Wang ]
diff --git a/live-build/auto/build b/live-build/auto/build
index 8f4b0bd5..12a0aac4 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -166,6 +166,10 @@ EOF
 		rm -f chroot/boot/initrd.img-*
 	fi
 
+	# remove crufty files that shouldn't be left in an image
+	rm -f chroot/var/cache/debconf/*-old chroot/var/lib/dpkg/*-old
+	Chroot chroot apt clean
+
 	if [ -f config/oem-config-preinstalled ]; then
 
 # This is cargo-culted almost verbatim (with some syntax changes for
diff --git a/live-build/auto/config b/live-build/auto/config
index 8477598b..3eb8dae8 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -676,6 +676,7 @@ lb config noauto \
 	--initsystem none \
 	--bootloader "$BOOTLOADER" \
 	--initramfs-compression lzma \
+	--cache false \
 	${BOOTAPPEND_LIVE:+--bootappend-live "$BOOTAPPEND_LIVE"} \
 	$OPTS \
 	"$@"
diff --git a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot
index 3b2a3492..91fdc554 100755
--- a/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot
+++ b/live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot
@@ -160,6 +160,27 @@ if [ -L "${rootd}/boot/initrd.img" ] && [ ! -e "${rootd}/boot/initrd.img" ]; the
 	rm "${rootd}/boot/initrd.img"
 fi
 
+if [ "${SUBPROJECT:-}" = minimized ]; then
+	# Remove various packages that we don't want in the minimized images.
+	# Some of these are tools that don't make sense by default
+	# non-interactively; some are libraries whose reverse-dependencies
+	# will have already been removed; open-vm-tools, it's a bug that this
+	# is in the common cloud seed because this should only be included
+	# in VMWare guest images, and we know none of the minimized images
+	# are targeted at VMWare.
+	_xchroot "${rootd}" env DEBIAN_FRONTEND=noninteractive \
+		apt-mark auto '^lib.*' '^python*' vim-runtime 2>/dev/null
+	# FIXME: iso-codes is a dep of software-properties and shouldn't be
+	_xchroot "${rootd}" env DEBIAN_FRONTEND=noninteractive \
+		apt-get -y autoremove --purge iso-codes xauth pastebinit \
+		plymouth open-vm-tools git shared-mime-info vim vim-common \
+		console-setup ncurses-term tmux screen policykit-1 \
+		xdg-user-dirs less run-one apport-symptoms \
+		ubuntu-cloudimage-keyring file
+
+	_xchroot "${rootd}" apt clean
+fi
+
 #### END COMMON ARCH FUNCTIONS