diff mbox series

[1/2] support/misc/Vagrantfile: move to Debian bullseyes (12)

Message ID 20240909152748.3876779-1-peter@korsgaard.com
State Accepted
Headers show
Series [1/2] support/misc/Vagrantfile: move to Debian bullseyes (12) | expand

Commit Message

Peter Korsgaard Sept. 9, 2024, 3:27 p.m. UTC
Ubuntu Bionic (18.04) was EOL'ed in June 2023:

https://ubuntu.com//blog/18-04-end-of-standard-support

And the VM image is only available in virtualbox format:

https://app.vagrantup.com/ubuntu/boxes/bionic64

So move to Debian bullseye (12), matching what we do for the docker image.
This is available in virtualbox and libvirt (qemu) format:

https://app.vagrantup.com/debian/boxes/bullseye64

Bullseye does not come with rsync out of the box, so install it.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 support/misc/Vagrantfile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Comments

Thomas Petazzoni Sept. 10, 2024, 8:44 p.m. UTC | #1
On Mon,  9 Sep 2024 17:27:46 +0200
Peter Korsgaard <peter@korsgaard.com> wrote:

> Ubuntu Bionic (18.04) was EOL'ed in June 2023:
> 
> https://ubuntu.com//blog/18-04-end-of-standard-support
> 
> And the VM image is only available in virtualbox format:
> 
> https://app.vagrantup.com/ubuntu/boxes/bionic64
> 
> So move to Debian bullseye (12), matching what we do for the docker image.
> This is available in virtualbox and libvirt (qemu) format:
> 
> https://app.vagrantup.com/debian/boxes/bullseye64
> 
> Bullseye does not come with rsync out of the box, so install it.
> 
> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
> ---
>  support/misc/Vagrantfile | 8 +++-----
>  1 file changed, 3 insertions(+), 5 deletions(-)

Both applied to master, thanks!

Thomas
diff mbox series

Patch

diff --git a/support/misc/Vagrantfile b/support/misc/Vagrantfile
index 2251a992dc..8252f555b6 100644
--- a/support/misc/Vagrantfile
+++ b/support/misc/Vagrantfile
@@ -12,7 +12,7 @@  VM_MEMORY=2048
 VM_CORES=1
 
 Vagrant.configure('2') do |config|
-	config.vm.box = 'ubuntu/bionic64'
+	config.vm.box = 'debian/bullseye64'
 
 	config.vm.provider :vmware_fusion do |v, override|
 		v.vmx['memsize'] = VM_MEMORY
@@ -42,12 +42,10 @@  Vagrant.configure('2') do |config|
 	end
 
 	config.vm.provision 'shell', privileged: true, inline:
-		"sed -i 's|deb http://us.archive.ubuntu.com/ubuntu/|deb mirror://mirrors.ubuntu.com/mirrors.txt|g' /etc/apt/sources.list
-		dpkg --add-architecture i386
+		"dpkg --add-architecture i386
 		apt-get -q update
-		apt-get purge -q -y snapd lxcfs lxd ubuntu-core-launcher snap-confine
 		apt-get -q -y install build-essential libncurses5-dev \
-			git bzr cvs mercurial subversion libc6:i386 unzip bc
+			git bzr cvs mercurial rsync subversion libc6:i386 unzip bc
 		apt-get -q -y autoremove
 		apt-get -q -y clean
 		update-locale LC_ALL=C"