Tools: Update Vagrant to new pre-reqs folder

This commit is contained in:
Stephen Dade 2019-04-03 22:19:18 +11:00 committed by Peter Barker
parent e8d6e4f135
commit f6535f0ed4
2 changed files with 2 additions and 2 deletions

View File

@ -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

View File

@ -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: