From f6535f0ed48ba94841982833dd22b5c3d22883d6 Mon Sep 17 00:00:00 2001 From: Stephen Dade Date: Wed, 3 Apr 2019 22:19:18 +1100 Subject: [PATCH] Tools: Update Vagrant to new pre-reqs folder --- Tools/vagrant/initvagrant-trusty64.sh | 2 +- Tools/vagrant/initvagrant.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/vagrant/initvagrant-trusty64.sh b/Tools/vagrant/initvagrant-trusty64.sh index 560759fcce4fa7..4011ac68862350 100644 --- a/Tools/vagrant/initvagrant-trusty64.sh +++ b/Tools/vagrant/initvagrant-trusty64.sh @@ -8,7 +8,7 @@ set -u echo "Initial setup of SITL-vagrant instance." -/vagrant/Tools/scripts/install-prereqs-ubuntu.sh -y +/vagrant/Tools/environment_install/install-prereqs-ubuntu.sh -y # extra packages we desire on the VM but aren't prereqs for AP compilation: sudo apt-get install -y valgrind gdb diff --git a/Tools/vagrant/initvagrant.sh b/Tools/vagrant/initvagrant.sh index 60c26bc2507417..695a64da11dc2f 100755 --- a/Tools/vagrant/initvagrant.sh +++ b/Tools/vagrant/initvagrant.sh @@ -29,7 +29,7 @@ sudo resize2fs /dev/sda1 usermod -a -G dialout $VAGRANT_USER echo "calling pre-reqs script..." -sudo -H -u $VAGRANT_USER /vagrant/Tools/scripts/install-prereqs-ubuntu.sh -y +sudo -H -u $VAGRANT_USER /vagrant/Tools/environment_install/install-prereqs-ubuntu.sh -y echo "...pre-reqs script done... initvagrant.sh continues." # run-in-terminal-window uses xterm: