zrzk
/
zr-v4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Tools: Update Vagrant to new pre-reqs folder

master
Stephen Dade 6 years ago committed by Peter Barker
parent
e8d6e4f135
commit
f6535f0ed4
2 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Tools/vagrant/initvagrant-trusty64.sh
  2. 2
      Tools/vagrant/initvagrant.sh

2
Tools/vagrant/initvagrant-trusty64.sh
Unescape View File

@ -8,7 +8,7 @@ set -u
echo "Initial setup of SITL-vagrant instance." 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: # extra packages we desire on the VM but aren't prereqs for AP compilation:
sudo apt-get install -y valgrind gdb sudo apt-get install -y valgrind gdb

2
Tools/vagrant/initvagrant.sh
Unescape View File

@ -29,7 +29,7 @@ sudo resize2fs /dev/sda1
usermod -a -G dialout $VAGRANT_USER usermod -a -G dialout $VAGRANT_USER
echo "calling pre-reqs script..." 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." echo "...pre-reqs script done... initvagrant.sh continues."
# run-in-terminal-window uses xterm: # run-in-terminal-window uses xterm:

Write Preview
Loading…
Cancel
Save