Merge lp:~fginther/livecd-rootfs/xenial-proposed-minimal-update

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.408.34) xenial; urgency=medium
+
+  * Add back pollinate for minimal after it is removed due to a dependency
+    on vim-common.  LP: #1779406.
+
+ -- Francis Ginther <francis.ginther@canonical.com>  Fri, 29 Jun 2018 10:42:06 -0500
+
 livecd-rootfs (2.408.33) xenial; urgency=medium
 
   * Zero fill space in UEFI partitions, too

live-build/ubuntu-cpc/hooks/999-cpc-fixes.chroot

@@ -177,6 +177,9 @@ if [ "${SUBPROJECT:-}" = minimized ]; then
 		console-setup ncurses-term tmux screen policykit-1 \
 		xdg-user-dirs less run-one apport-symptoms \
 		ubuntu-cloudimage-keyring file
+	# Add back pollinate, which gets removed due to a dependency on vim-common
+	_xchroot "${rootd}" env DEBIAN_FRONTEND=noninteractive \
+		apt-get install --no-install-recommends pollinate
 
 	_xchroot "${rootd}" apt clean
 fi