From ce5eaab96cffd0195515967ea29ec19d98771ea3 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Mon, 5 Oct 2020 11:54:20 +0000 Subject: [PATCH] Imported 2.689 No reason for CPC update specified. --- debian/changelog | 7 +++++++ live-build/ubuntu-cpc/hooks.d/base/vagrant.binary | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 54346c47..1bda81f5 100644 --- a/debian/changelog +++ b/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 Tue, 29 Sep 2020 12:59:23 -0500 + livecd-rootfs (2.688) groovy; urgency=medium * ubuntu-cpc: Fix spelling in vagrant file diff --git a/live-build/ubuntu-cpc/hooks.d/base/vagrant.binary b/live-build/ubuntu-cpc/hooks.d/base/vagrant.binary index 63b97871..49746926 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/vagrant.binary +++ b/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