summaryrefslogtreecommitdiffstats
path: root/build-root
diff options
context:
space:
mode:
authorKeith Burns (alagalah) <alagalah@gmail.com>2016-01-31 20:53:46 +0100
committerGerrit Code Review <gerrit@fd.io>2016-02-01 03:18:56 +0000
commitf5a857d52c5810d1360cff213d8c1f34ce8ef4d0 (patch)
treea0455a23abf7b8421e1a5a241f23e432c07f00b0 /build-root
parent004da76d2b83276a1fccf1876494ba0038816c68 (diff)
Vagrantfile doesn't rm git/vpp and vagrant reload --provision
result is not expected. ie don't get updates - only applied ubuntu changes in this patch. Change-Id: I194f5120734d63f1b815f86bb510f0c0981dd89b Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>
Diffstat (limited to 'build-root')
-rw-r--r--build-root/vagrant/bootstrap.ubuntu1404.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/build-root/vagrant/bootstrap.ubuntu1404.sh b/build-root/vagrant/bootstrap.ubuntu1404.sh
index 04f341a493f..35865faf8af 100644
--- a/build-root/vagrant/bootstrap.ubuntu1404.sh
+++ b/build-root/vagrant/bootstrap.ubuntu1404.sh
@@ -48,10 +48,12 @@ start hugepages
# Setup the vpp code
cd ~vagrant/
+
sudo -u vagrant mkdir git
cd git/
-# You will need to alter this line to reflect reality.
+# Check if git exists and remove it before attempting clone, else clone ineffective when "reload --provision"
+[ -d vpp ] && rm -rf vpp
sudo -H -u vagrant git clone /vpp
cd vpp/