vagrant-unbundled 2.2.4.0 → 2.2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45c2a36f946ec458cfa48fe29a49c7eccde00c9bde34c1e85dea5ebfb9e644b8
-  data.tar.gz: c859d383a0e7e821b7712bf96e5037b038bd8986a0449e91f698d77ef6622dc8
+  metadata.gz: dc55b87783fde68e4d0baa8a784b925cca0c8e47c52547b7c78416da27654dfb
+  data.tar.gz: b436b38448926f7e154a76deff00acbe0571e38ab28f38db01607a8fdc09b91f
 SHA512:
-  metadata.gz: 50bbd997c795f80689ce2b8c2d22ba8a75fb56c5899b9f786c8e8bc2dd0b589da64644ef679db3f0602be1d39d2b5ff08bb0811dd2c9bbe0de879bf88757c551
-  data.tar.gz: 34ef4f6fff708112c2c3cad5e9b6222ecf2a9c44c89bb4c2daa69dfbe384665bef219419e2bd94763492a70d7a19e6bf255faf7e4f2cb02bf9633e32ff5a7e34
+  metadata.gz: 9b19bbfea28bf8ab58f8ceb68a893a9594b782eb1f7057f478ccb04695813681d23fa50ca1f29d169c45ad81da536e693ff7c6fadab20d2b3de2888235508d94
+  data.tar.gz: 55b3e648bb7ec975d22b983b83cd340863dfd51f41ecb6b97807e12d220c6b6a1adbc3b038f7a62cd3424b85a8613f55abdd7f1ca5ff0b2ff749385c7f5b2428

data/CHANGELOG.md

@@ -1,3 +1,47 @@
+## 2.2.5 (July 19, 2019)
+
+FEATURES:
+
+- providers/docker: Private and Public networking support [GH-10702]
+
+IMPROVEMENTS:
+
+- command/global-status: Provide machine-readable information [GH-10506]
+- command/snapshot: Separate snapshot names for guests when listing snapshots [GH-10828]
+- command/box/update: Ignore missing metadata files when updating all boxes [GH-10829]
+- core: Use consistent settings when unpacking boxes as root [GH-10707]
+- core: Write metadata.json file when packaging box [GH-10706]
+- core: Remove whitespace from id file on load [GH-10727]
+- core/bundler: Support resolution when installed within system [GH-10894]
+- guest/coreos:  Update network configuration and hostname setting [GH-10752]
+- guest/freebsd: Add proper VirtualBox share folders support for FreeBSD guests [GH-10717]
+- guest/freebsd: Add unmount share folder for  VirtualBox guests [GH-10761]
+- guest/freebsd: Simplify network interface listing when configuring networks [GH-10763]
+- providers/docker: Add usable? check to docker provider [GH-10890]
+- synced_folder/smb: Remove configuration information from synced folder data [GH-10811]
+
+BUG FIXES:
+
+- command/box/update: Ensure the right version is picked when updating specific boxes [GH-10810]
+- command/cloud: Properly set variable from CLI argument parsing for `username` field [GH-10726]
+- command/rsync_auto: Use relative paths to machines folder path for file path Listener [GH-10902]
+- communicator/ssh: Remove net/sftp loading to prevent loading errors [GH-10745]
+- contrib/bash: Search for running_vm_list only in `machines` folder [GH-10841]
+- core/bundler: Properly parse multiple constants when installing plugins [GH-10896]
+- core/environment: Support plugin configuration within box Vagrantfiles [GH-10889]
+- core/triggers: Fix typo in UI output [GH-10748]
+- core/triggers: Properly exit with abort option [GH-10824]
+- core/triggers: Ensure guest names are string when filtering trigger configs [GH-10854]
+- core/triggers: Abort after all running processes have completed when parallel is enabled [GH-10891]
+- guest/void: Fix NFS capability detection [GH-10713]
+- guest/bsd: Properly set BSD options order for /etc/exports [GH-10909]
+- host/windows: Fix rubygems error when host has directory named `c` [GH-10803]
+- provider/virtualbox: Ensure non-existent machines do not attempt to list snapshots [GH-10784]
+- provider/docker: Properly set docker-compose config file with volume names [GH-10820]
+- provisioner/ansible: Fix pip installer hardcoded curl get_pip.py piped to python [GH-10625]
+- provisioner/chef: Update chef install check for guests [GH-10917]
+- synced_folders/rsync: Remove rsync__excludes from command if array is empty [GH-10901]
+
 ## 2.2.4 (February 27, 2019)
 
 FEATURES:

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-unbundled (2.2.4.0)
+    vagrant-unbundled (2.2.5.0)
       bcrypt_pbkdf (~> 1.0.0)
       childprocess (~> 0.6.0)
       ed25519 (~> 1.2.4)
@@ -38,7 +38,7 @@ GEM
   specs:
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    bcrypt_pbkdf (1.0.0)
+    bcrypt_pbkdf (1.0.1)
     builder (3.2.3)
     childprocess (0.6.3)
       ffi (~> 1.0, >= 1.0.11)
@@ -46,13 +46,13 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
-    domain_name (0.5.20180417)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     ed25519 (1.2.4)
     erubis (2.7.0)
     fake_ftp (0.1.1)
     ffi (1.10.0)
-    gssapi (1.2.0)
+    gssapi (1.3.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
@@ -72,9 +72,9 @@ GEM
     logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
-    mime-types (3.2.2)
+    mime-types (3.3)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
+    mime-types-data (3.2019.0904)
     multi_json (1.13.1)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -112,12 +112,12 @@ GEM
     rspec-support (3.5.0)
     ruby_dep (1.3.1)
     rubyntlm (0.6.2)
-    rubyzip (1.2.2)
+    rubyzip (1.2.4)
     safe_yaml (1.0.4)
     thor (0.18.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.5)
+    unf_ext (0.0.7.6)
     vagrant_cloud (2.0.2)
       rest-client (~> 2.0.2)
     wdm (0.1.1)
@@ -125,7 +125,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    winrm (2.3.1)
+    winrm (2.3.2)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -156,4 +156,4 @@ DEPENDENCIES
   webmock (~> 2.3.1)
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2010-2018 Mitchell Hashimoto
+Copyright (c) 2010-2019 Mitchell Hashimoto
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -19,6 +19,8 @@ between Windows, Mac OS X, and Linux.
 
 ## Quick Start
 
+Package dependencies: Vagrant requires `bsdtar` to be available on your system PATH to run successfully.
+
 For the quick-start, we'll bring up a development machine on
 [VirtualBox](https://www.virtualbox.org/) because it is free and works
 on all major platforms. Vagrant can, however, work with almost any
@@ -56,6 +58,14 @@ Once your Vagrant bundle is installed from Git repository, you can run the test
 
 This will run the unit test suite, which should come back all green!
 
+If you are developing Vagrant on a machine that already has a Vagrant package installation present, both will attempt to use the same folder for their configuration (location of this folder depends on system). This can cause errors when Vagrant attempts to load plugins. In this case, override the `VAGRANT_HOME` environment variable for your development version of Vagrant before running any commands, to be some new folder within the project or elsewhere on your machine. For example, in Bash:
+
+    export VAGRANT_HOME=~/.vagrant-dev
+
+You can now run Vagrant commands against the development version:
+
+    bundle exec vagrant
+
 Please take time to read the [HashiCorp Community Guidelines](https://www.hashicorp.com/community-guidelines) and the [Vagrant Contributing Guide](https://github.com/hashicorp/vagrant/blob/master/.github/CONTRIBUTING.md).
 
 Then you're good to go!

data/RELEASE.md

@@ -15,34 +15,20 @@ targeted at Vagrant core members who have the ability to cut a release.
     $ git push --tags
     ```
 
-1. Trigger an installer creation run within the HashiCorp Bamboo installation.
-  This will take around 45 minutes.
+1. This will automatically trigger an installer creation, upload the artifacts,
+  and publish the release.
 
-1. Download all the resulting artifacts into the `pkg/dist` folder relative to
-  the Vagrant repository on your local machine.
+1. After the release has been published update the `website/config.rb` to point
+  to the latest version, commit, and push.
 
-1. Run `./scripts/sign.sh` with the version that is being created. This must be
-    run from the Vagrant repo root. This will GPG sign and checksum the files.
+1. Publish the webiste by deleting the `stable-website` branch, recreate the branch,
+  and force push. From the `master` branch, run:
 
-1. Run the following command to upload the binaries to the releases site:
-
-    ```
-    $ hc-releases upload pkg/dist
-    ```
-
-1. Publish the new index files to the releases site:
-
-    ```
-    $ hc-releases publish
-    ```
-
-1. Update `website/config.rb` to point to the latest version, commit, and push.
-
-1. Tell HashiBot to deploy in `#deploys`
-
-    ```
-    hashibot deploy vagrant
-    ```
+   ```
+   $ git branch -D stable-website
+   $ git branch -b stable-website
+   $ git push -f origin stable-website
+   ```
 
 1. Update `version.txt` to append `.dev` and add a new blank entry in the
   CHANGELOG, commit, and push.

data/contrib/bash/completion.sh

@@ -85,7 +85,7 @@ _vagrant() {
               then
                 running_vm_list=$(grep 'active' "${vagrant_state_file}" | sed -e 's/"active"://' | tr ',' '\n' | cut -d '"' -f 2 | tr '\n' ' ')
               else
-                running_vm_list=$(find "${vagrant_state_file}" -type f -name "id" | awk -F"/" '{print $(NF-2)}')
+                running_vm_list=$(find "${vagrant_state_file}/machines" -type f -name "id" | awk -F"/" '{print $(NF-2)}')
               fi
               COMPREPLY=($(compgen -W "${running_vm_list}" -- ${cur}))
               return 0

data/lib/vagrant/action/builtin/mixin_synced_folders.rb

@@ -97,8 +97,14 @@ module Vagrant
             end
           end
 
+          folder_data = JSON.dump(folders)
+
+          # Scrub any register credentials from the synced folders
+          # configuration data to prevent accidental leakage
+          folder_data = Util::CredentialScrubber.desensitize(folder_data)
+
           machine.data_dir.join("synced_folders").open("w") do |f|
-            f.write(JSON.dump(folders))
+            f.write(folder_data)
           end
         end
 

data/lib/vagrant/action/general/package.rb

@@ -80,8 +80,10 @@ module Vagrant
           @app.call(env)
 
           @env[:ui].info I18n.t("vagrant.actions.general.package.compressing", fullpath: fullpath)
+
           copy_include_files
           setup_private_key
+          write_metadata_json
           compress
         end
 
@@ -151,6 +153,22 @@ module Vagrant
           end
         end
 
+        # Write the metadata file into the box so that the provider
+        # can be automatically detected when adding the box
+        def write_metadata_json
+          meta_path = File.join(@env["package.directory"], "metadata.json")
+          return if File.exist?(meta_path)
+
+          if @env[:machine] && @env[:machine].provider_name
+            provider_name = @env[:machine].provider_name
+          elsif @env[:env] && @env[:env].default_provider
+            provider_name = @env[:env].default_provider
+          else
+            return
+          end
+          File.write(meta_path, {provider: provider_name}.to_json)
+        end
+
         # This will copy the generated private key into the box and use
         # it for SSH by default. We have to do this because we now generate
         # random keypairs on boot, so packaged boxes would stop working

data/lib/vagrant/action/runner.rb

@@ -43,7 +43,7 @@ module Vagrant
           machine = environment[:machine]
           machine_name = machine.name if machine
 
-          ui = Vagrant::UI::Prefixed.new(env.ui, "vargant")
+          ui = Vagrant::UI::Prefixed.new(env.ui, "vagrant")
           triggers = Vagrant::Plugin::V2::Trigger.new(env, env.vagrantfile.config.trigger, machine, ui)
         end
 

data/lib/vagrant/action/warden.rb

@@ -28,7 +28,7 @@ module Vagrant
 
           machine = env[:machine]
           machine_name = machine.name if machine
-          ui = Vagrant::UI::Prefixed.new(@env.ui, "vargant")
+          ui = Vagrant::UI::Prefixed.new(@env.ui, "vagrant")
           @triggers = Vagrant::Plugin::V2::Trigger.new(@env, @env.vagrantfile.config.trigger, machine, ui)
         end
 

data/lib/vagrant/batch_action.rb

@@ -71,6 +71,10 @@ module Vagrant
         thread = Thread.new do
           Thread.current[:error] = nil
 
+          # Note that this thread is being used for running
+          # a batch action
+          Thread.current[:batch_parallel_action] = par
+
           # Record our pid when we started in order to figure out if
           # we've forked...
           start_pid = Process.pid
@@ -160,6 +164,16 @@ module Vagrant
       if !errors.empty?
         raise Errors::BatchMultiError, message: errors.join("\n\n")
       end
+
+      # Check if any threads set an exit code and exit if found. If
+      # multiple threads have exit code values set, the first encountered
+      # will be the value used.
+      threads.each do |thread|
+        if thread[:exit_code]
+          @logger.debug("Found exit code set within batch action thread. Exiting")
+          Process.exit!(thread[:exit_code])
+        end
+      end
     end
   end
 end

data/lib/vagrant/box_collection.rb

@@ -116,7 +116,7 @@ module Vagrant
           # Extract the box into a temporary directory.
           @logger.debug("Unpacking box into temporary directory: #{temp_dir}")
           result = Util::Subprocess.execute(
-            "bsdtar", "-v", "-x", "-m", "-s", "|\\\\\|/|", "-C", temp_dir.to_s, "-f", path.to_s)
+            "bsdtar", "--no-same-owner", "--no-same-permissions", "-v", "-x", "-m", "-s", "|\\\\\|/|", "-C", temp_dir.to_s, "-f", path.to_s)
           if result.exit_code != 0
             raise Errors::BoxUnpackageFailure,
               output: result.stderr.to_s

data/lib/vagrant/bundler.rb

@@ -40,6 +40,20 @@ module Vagrant
     def initialize
       @plugin_gem_path = Vagrant.user_data_path.join("gems", RUBY_VERSION).freeze
       @logger = Log4r::Logger.new("vagrant::bundler")
+
+      # TODO: Remove fix when https://github.com/rubygems/rubygems/pull/2735
+      # gets merged and released
+      #
+      # Because of a rubygems bug, we need to set the gemrc file path
+      # through this method rather than relying on the environment varible
+      # GEMRC. On windows, that path gets split on `:`: and `;`, which means
+      # the drive letter gets treated as its own path. If that path exists locally,
+      # (like having a random folder called `c` where the library was invoked),
+      # it fails thinking the folder `c` is a gemrc file.
+      gemrc_val = ENV["GEMRC"]
+      ENV["GEMRC"] = ""
+      Gem.configuration = Gem::ConfigFile.new(["--config-file", gemrc_val])
+      ENV["GEMRC"] = gemrc_val
     end
 
     # Enable Vagrant environment specific plugins at given data path
@@ -62,12 +76,8 @@ module Vagrant
 
       # Add HashiCorp RubyGems source
       if !Gem.sources.include?(HASHICORP_GEMSTORE)
-        current_sources = Gem.sources.sources.dup
-        Gem.sources.clear
-        Gem.sources << HASHICORP_GEMSTORE
-        current_sources.each do |src|
-          Gem.sources << src
-        end
+        sources = [HASHICORP_GEMSTORE] + Gem.sources.sources
+        Gem.sources.replace(sources)
       end
 
       # Generate dependencies for all registered plugins
@@ -292,13 +302,19 @@ module Vagrant
           end
           source_list[name] << source
         end
-        Gem::Dependency.new(name, gem_version)
+        Gem::Dependency.new(name, *gem_version.split(","))
       end
 
       if Vagrant.strict_dependency_enforcement
         @logger.debug("Enabling strict dependency enforcement")
         plugin_deps += vagrant_internal_specs.map do |spec|
           next if system_plugins.include?(spec.name)
+          # If we are not running within the installer and
+          # we are not within a bundler environment then we
+          # only want activated specs
+          if !Vagrant.in_installer? && !Vagrant.in_bundler?
+            next if !spec.activated?
+          end
           Gem::Dependency.new(spec.name, spec.version)
         end.compact
       else
@@ -401,8 +417,13 @@ module Vagrant
       Gem::Resolver.compose_sets(*sets)
     end
 
-    # @return [Array<[Gem::Specification, String]>] spec and directory pairs
+    # @return [Array<[Gem::Specification]>] spec list
     def vagrant_internal_specs
+      # activate any dependencies up front so we can always
+      # pin them when resolving
+      Gem::Specification.find { |s| s.name == "vagrant" && s.activated? }.
+        runtime_dependencies.each { |d| gem d.name, *d.requirement.as_list }
+      # discover all the gems we have available
       list = {}
       directories = [Gem::Specification.default_specifications_dir]
       Gem::Specification.find_all{true}.each do |spec|

data/lib/vagrant/cli.rb

@@ -14,7 +14,7 @@ module Vagrant
       @main_args, @sub_command, @sub_args = split_main_and_subcommand(argv)
 
       if Vagrant::Util::Experimental.feature_enabled?("typed_triggers")
-        ui = Vagrant::UI::Prefixed.new(env.ui, "vargant")
+        ui = Vagrant::UI::Prefixed.new(env.ui, "vagrant")
         @triggers = Vagrant::Plugin::V2::Trigger.new(env, env.vagrantfile.config.trigger, nil, ui)
       end
 

data/lib/vagrant/environment.rb

@@ -175,9 +175,7 @@ module Vagrant
       # Load any global plugins
       Vagrant::Plugin::Manager.instance.load_plugins(plugins)
 
-      if !vagrantfile.config.vagrant.plugins.empty?
-        plugins = process_configured_plugins
-      end
+      plugins = process_configured_plugins
 
       # Call the hooks that does not require configurations to be loaded
       # by using a "clean" action runner
@@ -922,6 +920,49 @@ module Vagrant
 
     protected
 
+    # Attempt to guess the configured provider in use. Will fallback
+    # to the default provider if an explicit provider name is not
+    # provided. This can be pretty error prone, but is used during
+    # initial environment setup to allow loading plugins so it doesn't
+    # need to be perfect
+    #
+    # @return [String]
+    def guess_provider
+      gp = nil
+      ARGV.each_with_index do |val, idx|
+        if val.start_with?("--provider=")
+          gp = val.split("=", 2).last
+          break
+        elsif val == "--provider"
+          gp = ARGV[idx+1]
+          break
+        end
+      end
+      return gp.to_sym if gp
+      begin
+        default_provider
+      rescue Errors::NoDefaultProvider
+        # if a provider cannot be determined just return nil
+        nil
+      end
+    end
+
+    # Load any configuration provided by guests defined within
+    # the Vagrantfile to pull plugin information they may have
+    # defined.
+    def find_configured_plugins
+      plugins = []
+      provider = guess_provider
+      vagrantfile.machine_names.each do |mname|
+        ldp = @local_data_path.join("machines/#{mname}/#{provider}") if @local_data_path
+        plugins << vagrantfile.machine_config(mname, guess_provider, boxes, ldp, false)[:config]
+      end
+      result = plugins.reverse.inject(Vagrant::Util::HashWithIndifferentAccess.new) do |memo, val|
+        Vagrant::Util::DeepMerge.deep_merge(memo, val.vagrant.plugins)
+      end
+      Vagrant::Util::DeepMerge.deep_merge(result, vagrantfile.config.vagrant.plugins)
+    end
+
     # Check for any local plugins defined within the Vagrantfile. If
     # found, validate they are available. If they are not available,
     # request to install them, or raise an exception
@@ -939,7 +980,7 @@ module Vagrant
       # Check if defined plugins are installed
       installed = Plugin::Manager.instance.installed_plugins
       needs_install = []
-      config_plugins = vagrantfile.config.vagrant.plugins
+      config_plugins = find_configured_plugins
       config_plugins.each do |name, info|
         if !installed[name]
           needs_install << name
@@ -980,7 +1021,11 @@ module Vagrant
         ui.warn(I18n.t("vagrant.plugins.local.install_rerun_command"))
         exit(-1)
       end
-      Vagrant::Plugin::Manager.instance.local_file.installed_plugins
+      if Vagrant::Plugin::Manager.instance.local_file
+        Vagrant::Plugin::Manager.instance.local_file.installed_plugins
+      else
+        {}
+      end
     end
 
     # This method copies the private key into the home directory if it

data/lib/vagrant/machine.rb

@@ -399,7 +399,10 @@ module Vagrant
         # Read the id file from the data directory if it exists as the
         # ID for the pre-existing physical representation of this machine.
         id_file = @data_dir.join("id")
-        @id = id_file.read.chomp if id_file.file?
+        id_content = id_file.read.strip if id_file.file?
+        if !id_content.to_s.empty?
+          @id = id_content
+        end
       end
 
       if @id != old_id && @provider

data/lib/vagrant/plugin/v2/trigger.rb

@@ -110,7 +110,7 @@ module Vagrant
             match = false
             if trigger.only_on
               trigger.only_on.each do |o|
-                if o.match(guest_name)
+                if o.match(guest_name.to_s)
                   # trigger matches on current guest, so we're fine to use it
                   match = true
                   break
@@ -300,8 +300,17 @@ module Vagrant
         #
         # @param [Integer] code Code to exit Vagrant on
         def trigger_abort(exit_code)
-          @ui.warn(I18n.t("vagrant.trigger.abort"))
-          exit(exit_code)
+          if Thread.current[:batch_parallel_action]
+            @ui.warn(I18n.t("vagrant.trigger.abort_threaded"))
+            @logger.debug("Trigger abort within parallel batch action. " \
+              "Setting exit code and terminating.")
+            Thread.current[:exit_code] = exit_code
+            Thread.current.terminate
+          else
+            @ui.warn(I18n.t("vagrant.trigger.abort"))
+            @logger.debug("Trigger abort within non-parallel action, exiting directly")
+            Process.exit!(exit_code)
+          end
         end
 
         # Calls the given ruby block for execution

data/lib/vagrant/shared_helpers.rb

@@ -35,6 +35,14 @@ module Vagrant
     !!ENV["VAGRANT_INSTALLER_ENV"]
   end
 
+  # This returns a true/false if we are running within a bundler environment
+  #
+  # @return [Boolean]
+  def self.in_bundler?
+    !!ENV["BUNDLE_GEMFILE"] &&
+      !defined?(::Bundler).nil?
+  end
+
   # Returns the path to the embedded directory of the Vagrant installer,
   # if there is one (if we're running in an installer).
   #

data/lib/vagrant/util/guest_inspection.rb

@@ -23,6 +23,25 @@ module Vagrant
           comm.test("systemctl -q is-active systemd-networkd.service", sudo: true)
         end
 
+        # Check if a unit file with the given name is defined. Name can
+        # be a pattern or explicit name.
+        #
+        # @param [Vagrant::Plugin::V2::Communicator] comm Guest communicator
+        # @param [String] name Name or pattern to search
+        # @return [Boolean]
+        def systemd_unit_file?(comm, name)
+          comm.test("systemctl -q list-unit-files | grep \"#{name}\"")
+        end
+
+        # Check if a unit is currently active within systemd
+        #
+        # @param [Vagrant::Plugin::V2::Communicator] comm Guest communicator
+        # @param [String] name Name or pattern to search
+        # @return [Boolean]
+        def systemd_unit?(comm, name)
+          comm.test("systemctl -q list-units | grep \"#{name}\"")
+        end
+
         # Check if given service is controlled by systemd
         #
         # @param [Vagrant::Plugin::V2::Communicator] comm Guest communicator

data/lib/vagrant/vagrantfile.rb

@@ -112,7 +112,7 @@ module Vagrant
     # @param [Pathname] data_path Machine data path
     # @return [Hash<Symbol, Object>] Various configuration parameters for a
     #   machine. See the main documentation body for more info.
-    def machine_config(name, provider, boxes, data_path=nil)
+    def machine_config(name, provider, boxes, data_path=nil, validate_provider=true)
       keys = @keys.dup
 
       sub_machine = @config.vm.defined_vms[name]
@@ -127,7 +127,7 @@ module Vagrant
       box_formats      = nil
       if provider != nil
         provider_plugin  = Vagrant.plugin("2").manager.providers[provider]
-        if !provider_plugin
+        if !provider_plugin && validate_provider
           providers  = Vagrant.plugin("2").manager.providers.to_hash.keys
           if providers
             providers_str = providers.join(', ')
@@ -145,18 +145,22 @@ module Vagrant
             machine: name, provider: provider, providers: providers_str
         end
 
-        provider_cls     = provider_plugin[0]
-        provider_options = provider_plugin[1]
-        box_formats      = provider_options[:box_format] || provider
-
-        # Test if the provider is usable or not
-        begin
-          provider_cls.usable?(true)
-        rescue Errors::VagrantError => e
-          raise Errors::ProviderNotUsable,
-            machine: name.to_s,
-            provider: provider.to_s,
-            message: e.to_s
+        if validate_provider
+          provider_cls     = provider_plugin[0]
+          provider_options = provider_plugin[1]
+          box_formats      = provider_options[:box_format] || provider
+
+          # Test if the provider is usable or not
+          begin
+            provider_cls.usable?(true)
+          rescue Errors::VagrantError => e
+            raise Errors::ProviderNotUsable,
+              machine: name.to_s,
+              provider: provider.to_s,
+              message: e.to_s
+          end
+        else
+          box_formats = provider
         end
       end
 

data/plugins/commands/box/command/update.rb

@@ -80,7 +80,7 @@ module VagrantPlugins
           end
 
           to_update = [
-            [name, provider, boxes[name][provider].sort.last],
+            [name, provider, boxes[name][provider].sort_by{|n| Gem::Version.new(n)}.last],
           ]
 
           to_update.each do |n, p, v|
@@ -128,7 +128,13 @@ module VagrantPlugins
             if download_options[:insecure].nil?
               download_options[:insecure] = machine.config.vm.box_download_insecure
             end
-            box_update(box, version, machine.ui, download_options, force)
+
+            begin
+              box_update(box, version, machine.ui, download_options, force)
+            rescue Vagrant::Errors::BoxUpdateNoMetadata => e
+              machine.ui.warn(e)
+              next
+            end
           end
         end