aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeith Burns (alagalah) <alagalah@gmail.com>2016-01-31 21:15:27 +0100
committerDave Wallace <dwallacelf@gmail.com>2016-02-01 03:42:12 +0000
commitd5201c80078fdecad8e6524e430b4b255f91b6b6 (patch)
treec8c0b5241ce7da3579a5ba559cebca2745ae5eeb
parentf5a857d52c5810d1360cff213d8c1f34ce8ef4d0 (diff)
Changes to Centos bootstrap to remove ~/git/vpp if it exists before attempting clone
- fixes issue with vagrant reload --provision not updating clone of clone Change-Id: I506d4cbca90b30bf787c1be7e4ad39d748ea7f5b Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>
-rw-r--r--build-root/vagrant/bootstrap.centos7.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/build-root/vagrant/bootstrap.centos7.sh b/build-root/vagrant/bootstrap.centos7.sh
index 1d811e45599..f55e68a242d 100644
--- a/build-root/vagrant/bootstrap.centos7.sh
+++ b/build-root/vagrant/bootstrap.centos7.sh
@@ -28,7 +28,8 @@ 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