From 710b8da9533c13f75c087dd243175777510a0fc2 Mon Sep 17 00:00:00 2001 From: Alex Wu Date: Tue, 10 Jan 2017 13:21:13 +0800 Subject: [PATCH] add config option 'box_ignore_box_vagrantfile' to ignore the Vagrantfile packaged in the box. --- lib/vagrant/vagrantfile.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vagrant/vagrantfile.rb b/lib/vagrant/vagrantfile.rb index 3f3c8c826..32bb06017 100644 --- a/lib/vagrant/vagrantfile.rb +++ b/lib/vagrant/vagrantfile.rb @@ -191,7 +191,7 @@ module Vagrant local_keys = keys.dup # Load the box Vagrantfile, if there is one - if config.vm.box && boxes + if config.vm.box && !config.vm.box_ignore_box_vagrantfile && boxes box = boxes.find(config.vm.box, box_formats, config.vm.box_version) if box box_vagrantfile = find_vagrantfile(box.directory)