From 25589e509e4cb2cece187b19cae1e3d4dfb4c134 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Tue, 6 May 2014 16:27:48 -0700 Subject: [PATCH] commands/reload: if --provision is present, force provision [GH-3657] --- CHANGELOG.md | 1 + plugins/commands/up/start_mixins.rb | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7f3c587eb..81ba16950 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ BUG FIXES: - core: Global control works from directories that don't have a Vagrantfile. - commands/package: `--base` works without crashing for VirtualBox. + - commands/reload: If `--provision` is specified, force provisioning. [GH-3657] - guests/redhat: Fix networking issues with CentOS. [GH-3649] - providers/docker: Show proper error message when on Linux. [GH-3654] - synced\_folders/rsync: Create the directory before syncing. diff --git a/plugins/commands/up/start_mixins.rb b/plugins/commands/up/start_mixins.rb index 6bc793fae..e0aeb6de2 100644 --- a/plugins/commands/up/start_mixins.rb +++ b/plugins/commands/up/start_mixins.rb @@ -13,6 +13,7 @@ module VagrantPlugins # Add the options parser.on("--[no-]provision", "Enable or disable provisioning") do |p| options[:provision_enabled] = p + options[:provision_ignore_sentinel] = true end parser.on("--provision-with x,y,z", Array,