From b6a5978b11856a46599708e0c2cfe12ef1861f87 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 26 Jan 2016 22:06:10 +0100 Subject: [PATCH 1/1] makebuildserver: make chef find the custom cache locations --- makebuildserver | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/makebuildserver b/makebuildserver index aeb5ebbc..77c6063c 100755 --- a/makebuildserver +++ b/makebuildserver @@ -367,6 +367,13 @@ if 'aptproxy' in config and config['aptproxy']: config.vm.provision :shell, :inline => 'sudo echo "Acquire::http {{ Proxy \\"{0}\\"; }};" > /etc/apt/apt.conf.d/02proxy && sudo apt-get update' """.format(config['aptproxy']) +# buildserver/ is shared to the VM's /vagrant by default so the old default +# does not need a custom mount +if cachedir != 'buildserver/cache': + vagrantfile += """ + config.vm.synced_folder '{0}', '/vagrant/cache' +""".format(cachedir) + vagrantfile += """ config.vm.provision :chef_solo do |chef| chef.cookbooks_path = "cookbooks" -- 2.30.2