Skip to content

Commit

Permalink
Vagrant: add support for Ubuntu Noble, 24.04
Browse files Browse the repository at this point in the history
  • Loading branch information
peterbarker committed May 10, 2024
1 parent 7b02a99 commit 178c57a
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 2 deletions.
10 changes: 8 additions & 2 deletions Tools/vagrant/initvagrant.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,15 @@ echo USING VAGRANT_USER:$VAGRANT_USER

cd /home/$VAGRANT_USER

IS_BENTO=0
if [ -e /etc/update-motd.d/99-bento ]; then
IS_BENTO=1
fi

# artful rootfs is 2GB without resize:
sudo resize2fs /dev/sda1
# artful rootfs is 2GB without resize. Do not resize if using Bento:
if [ ! $IS_BENTO ]; then
sudo resize2fs /dev/sda1
fi

echo "calling pre-reqs script..."
sudo -H -u $VAGRANT_USER /vagrant/Tools/environment_install/install-prereqs-ubuntu.sh -y
Expand Down
21 changes: 21 additions & 0 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -282,4 +282,25 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
end
mantic.vm.boot_timeout = 1200
end

# 24.04 end of standard support Jun 2029
# note the use of "bento" here; Ubuntu stopped providing Vagrant
# images due to Hashicorp adopting the "Business Source License".
config.vm.define "noble", autostart: false do |noble|
noble.vm.box = "bento/ubuntu-24.04"
noble.vm.provision :shell, path: "Tools/vagrant/initvagrant.sh"
noble.vm.provider "virtualbox" do |vb|
vb.name = "ArduPilot (noble)"
end
noble.vm.boot_timeout = 1200
end
config.vm.define "noble-desktop", autostart: false do |noble|
noble.vm.box = "bento/ubuntu-24.04"
noble.vm.provision :shell, path: "Tools/vagrant/initvagrant-desktop.sh"
noble.vm.provider "virtualbox" do |vb|
vb.name = "ArduPilot (noble-desktop)"
vb.gui = true
end
noble.vm.boot_timeout = 1200
end
end

0 comments on commit 178c57a

Please sign in to comment.