Merge branch 'ubuntu/master' of git+ssh://git.launchpad.net/livecd-rootfs into raspi-desktop-1

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.689) groovy; urgency=medium
+
+  * ubuntu-cpc: remove explicit install of virtualbox-guest-utils.
+    LP: #1895862
+
+ -- John Chittum <john.chittum@canonical.com>  Tue, 29 Sep 2020 12:59:23 -0500
+
 livecd-rootfs (2.688) groovy; urgency=medium
 
   * ubuntu-cpc: Fix spelling in vagrant file

live-build/ubuntu-cpc/hooks.d/base/vagrant.binary

@@ -58,12 +58,6 @@ cleanup_vagrant() {
 }
 trap cleanup_vagrant EXIT
 
-chroot ${mount_d} apt-get update
-# virtualbox-guest-utils Recommends: virtualbox-guest-x11, which we want to
-# avoid pulling into a cloud image.
-chroot ${mount_d} apt-get install --no-install-recommends -y virtualbox-guest-utils
-chroot ${mount_d} apt-get clean
-
 # Create and setup users inside the image.
 # Vagrant users expect a "vagrant" user with a "vagrant" username.
 # See https://www.vagrantup.com/docs/boxes/base.html