From 918448031eb2ed61e7ff2bc606209221360d8b13 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Sat, 14 Oct 2023 13:16:45 +1100
Subject: [PATCH] Vagrant: add Mantic Minotaur to available VMs

---
 Tools/vagrant/initvagrant.sh |  4 ++--
 Vagrantfile                  | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/Tools/vagrant/initvagrant.sh b/Tools/vagrant/initvagrant.sh
index f600e40096..08bd7d81c3 100755
--- a/Tools/vagrant/initvagrant.sh
+++ b/Tools/vagrant/initvagrant.sh
@@ -42,6 +42,8 @@ sudo -u $VAGRANT_USER ln -fs /vagrant/Tools/vagrant/screenrc /home/$VAGRANT_USER
 perl -pe 's/kernel.yama.ptrace_scope = ./kernel.yama.ptrace_scope = 0/' -i /etc/sysctl.d/10-ptrace.conf
 echo 0 > /proc/sys/kernel/yama/ptrace_scope
 
+RELEASE_CODENAME=$(lsb_release -c -s)
+
 if [ ${RELEASE_CODENAME} != 'bionic' ]; then
     # build JSB sim
     apt-get install -y libtool automake autoconf libexpat1-dev cmake
@@ -63,8 +65,6 @@ echo "source $BASHRC_GIT" |
 # link a half-way decent .mavinit.scr into place:
 sudo --login -u $VAGRANT_USER ln -sf /vagrant/Tools/vagrant/mavinit.scr /home/$VAGRANT_USER/.mavinit.scr
 
-RELEASE_CODENAME=$(lsb_release -c -s)
-
 # no multipath available, stop mutlipathd complaining about lack of data:
 if [ ${RELEASE_CODENAME} == 'jammy' ]; then
     cat >>/etc/multipath.conf <<EOF
diff --git a/Vagrantfile b/Vagrantfile
index 45fb5b03cb..9ab2a986a5 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -263,4 +263,23 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
     lunar.vm.boot_timeout = 1200
   end
+
+  # 23.10 EOL Jul 2024
+  config.vm.define "mantic", autostart: false do |mantic|
+    mantic.vm.box = "ubuntu/mantic64"
+    mantic.vm.provision :shell, path: "Tools/vagrant/initvagrant.sh"
+    mantic.vm.provider "virtualbox" do |vb|
+      vb.name = "ArduPilot (mantic)"
+    end
+    mantic.vm.boot_timeout = 1200
+  end
+  config.vm.define "mantic-desktop", autostart: false do |mantic|
+    mantic.vm.box = "ubuntu/mantic64"
+    mantic.vm.provision :shell, path: "Tools/vagrant/initvagrant-desktop.sh"
+    mantic.vm.provider "virtualbox" do |vb|
+      vb.name = "ArduPilot (mantic-desktop)"
+      vb.gui = true
+    end
+    mantic.vm.boot_timeout = 1200
+  end
 end