From f5a857d52c5810d1360cff213d8c1f34ce8ef4d0 Mon Sep 17 00:00:00 2001 From: "Keith Burns (alagalah)" Date: Sun, 31 Jan 2016 20:53:46 +0100 Subject: [PATCH] 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) --- build-root/vagrant/bootstrap.ubuntu1404.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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/ -- 2.16.6