vagrant-unbundled 2.0.3.0 → 2.0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3185c5c6b889db7a99b69caedd46ad10ea9e6ef9b3062873e8ea8387cc55976
-  data.tar.gz: 440bf7accc0eb3e94c0cad83c867136d18fe3e94858bcd0aeef08e58a2d1140e
+  metadata.gz: 7f05389ae1ff4023e08b4a240e16afc13f24fb766254196f09ce91cf0f0c70b4
+  data.tar.gz: e76853469f4db645991f1b98bebca28cffc1cbfbe4d29f4c11033dc1e1099ce4
 SHA512:
-  metadata.gz: 44d8a816903baab72e8fe6cf14696665ae901e5c7def8ad2f950118cd18b5363467f58889bd45ea7f412ad81eda321c600f78769dfa76c988d166e143cc17208
-  data.tar.gz: 808c99ca866560d876ba1f07541139ab89f573cf87456750c6311bf989353cdbdd177343e997fe012700e6ff0f52300d0e367c6f1f1af333e8aa03dd8563f5d4
+  metadata.gz: 499aa7f81c240e7b9e313ffc2dc2f6c9d85a8d0b06d8582e16fb05e5b6b762a56b35ba3c738bfb506fb7f085048a4c239dd47861b25cd1c949d214618e68e43a
+  data.tar.gz: e1dede9125879c569429a21d1c4f698f2d13c8cbad9bc84616a5a784ddfb30dce10ade705bbc1a0bf408fbe2ea23ae97ede54b44de71c942b4f1c8c1c004a131

data/CHANGELOG.md

@@ -1,3 +1,36 @@
+## 2.0.4 (April 20, 2018)
+
+FEATURES:
+
+- core: Vagrant aliases [GH-9504]
+
+IMPROVEMENTS:
+
+- communicators/ssh: Update file permissions when generating new key pairs [GH-9676]
+- core: Make resolv-replace usage opt-in instead of opt-out [GH-9644]
+- core: Suppress error messages from checkpoint runs [GH-9645]
+- guests/coreos: Identify operating systems closely related to CoreOS [GH-9600]
+- guests/debian: Adjust network configuration file prefix to 50- [GH-9646]
+- guests/photon: Less specific string grep to fix PhotonOS 2.0 detection [GH-9528]
+- guests/windows: Fix slow timeout when updating windows hostname [GH-9578]
+- hosts/windows: Make powershell version detection timeout configurable [GH-9506]
+- providers/virtualbox: Improve network collision error message [GH-9685]
+- provisioner/chef_solo: Improve Windows drive letter removal hack for remote paths[GH-9490]
+- provisioner/chef_zero: File path expand all chef_zero config path options [GH-9690]
+- provisioner/puppet: Puppet structured facts toyaml on provisioner [GH-9670]
+- provisioner/salt: Add master_json_config & minion_json_config options [GH-9420]
+- util/platform: Warn on ArgumentError exceptions from encoding [GH-9506]
+
+BUG FIXES:
+
+- commands/package: Fix uninitialized constant error [GH-9654]
+- communicators/winrm: Fix command filter to properly parse commands [GH-9673]
+- hosts/windows: Properly respect the VAGRANT_PREFER_SYSTEM_BIN environment variable [GH-9503]
+- hosts/windows: Fix virtualbox shared folders path for windows guests [GH-8099]
+- guests/freebsd: Fix typo in command that manages configuring networks [GH-9705]
+- util/checkpoint_client: Respect VAGRANT_CHECKPOINT_DISABLE environment variable [GH-9659]
+- util/platform: Use `--version` instead of `version` for WSL validation [GH-9674]
+
 ## 2.0.3 (March 15, 2018)
 
 IMPROVEMENTS:
@@ -306,7 +339,7 @@ BUG FIXES:
   - core/bundler: Check if source is local path and prevent addition to remote sources [GH-8401]
   - core/ui: Prevent deadlock detection errors [GH-8414, GH-8125]
   - guests/debian: Remove hardcoded device name in interface template [GH-8336, GH-7960]
-  - guests/linux: Fix SMB mount capbability [GH-8410, GH-8404]
+  - guests/linux: Fix SMB mount capability [GH-8410, GH-8404]
   - hosts/windows: Fix issues with Windows encoding [GH-8385, GH-8380, GH-8212, GH-8207, GH-7516]
   - hosts/windows: Fix UNC path generation when UNC path is provided [GH-8504]
   - provisioners/salt: Allow Salt version to match 2 digit month [GH-8428]
@@ -524,7 +557,7 @@ BUG FIXES:
   - guests/redhat: Use `/sbin/ip` to list and configure networks for
       compatability with older versions of CentOS [GH-7482]
   - guests/redhat: Ensure newline when inserting public key [GH-7598, GH-7605]
-  - guests/ubuntu: Use /etc/os-release to detech [GH-7524]
+  - guests/ubuntu: Use /etc/os-release to detect [GH-7524]
   - guests/ubuntu: Use short hostname [GH-7488, GH-7605]
   - providers/hyperv: Fix version check and catch statement [GH-7447, GH-7487]
 
@@ -658,7 +691,7 @@ BUG FIXES:
   - providers/virtualbox: Set maximum network adapters to 36 [GH-7293, GH-7286]
   - providers/virtualbox: Do not fail when master VM from linked clone is
       missing [GH-7126, GH-6742]
-  - providers/virtualbox: Use scoped overrides in preparring NFS
+  - providers/virtualbox: Use scoped overrides in preparing NFS
       [GH-7387, GH-7386]
   - provisioners/ansible: Fix a race condition in the concurrent generations of
       the ansible inventory file, while running `vagrant up --parallel`
@@ -1014,7 +1047,7 @@ BUG FIXES:
   - provisioners/ansible: disable color if Vagrant is not colored [GH-5531, GH-5532]
   - provisioners/ansible: only show ansible-playbook command when `verbose` option is enabled [GH-5803]
   - provisioners/ansible: fix a race condition in the inventory file generation [GH-5551]
-  - provisioners/docker: use `service` to restart Docker instad of upstart [GH-5245, GH-5577]
+  - provisioners/docker: use `service` to restart Docker instead of upstart [GH-5245, GH-5577]
   - provisioners/docker: Only add docker user to group if exists. [GH-5315]
   - provisioners/docker: Use https for repo [GH-5749]
   - provisioners/docker: `apt-get update` before installing linux kernel
@@ -1249,7 +1282,7 @@ IMPROVEMENTS:
       deleted by default. [GH-4327]
   - commands/plugin: Better error output is shown when plugin installation
       fails.
-  - commands/reload: show post up messsage [GH-4168]
+  - commands/reload: show post up message [GH-4168]
   - commands/rsync-auto: Add `--poll` flag. [GH-4392]
   - communicators/winrm: Show stdout/stderr if command fails. [GH-4094]
   - guests/nixos: Added better NFS support. [GH-3983]
@@ -1537,7 +1570,7 @@ BUG FIXES:
       already for 127.0.1.1 [GH-3271]
   - guests/linux: For `read_ip_address` capability, set `LANG=en` so
       it works on international systems. [GH-3029]
-  - providers/virtualbox: VirtalBox detection works properly again on
+  - providers/virtualbox: VirtualBox detection works properly again on
       Windows when the `VBOX_INSTALL_PATH` has multiple elements. [GH-3549]
   - providers/virtualbox: Forcing MAC address on private network works
       properly again. [GH-3588]
@@ -1714,7 +1747,7 @@ BUG FIXES:
   - core: Assume a box isn't metadata if it exceeds 20 MB. [GH-3107]
   - core: Asking for input works even in consoles that don't support
     hiding input. [GH-3119]
-  - core: Adding a box by path in Cygwin on Windos works. [GH-3132]
+  - core: Adding a box by path in Cygwin on Windows works. [GH-3132]
   - core: PowerShell scripts work when they're in a directory with
     spaces. [GH-3100]
   - core: If you add a box path that doesn't exist, error earlier. [GH-3091]
@@ -2030,7 +2063,7 @@ BUG FIXES:
   - core: Don't load Vagrantfile on `vagrant plugin` commands, allowing
     Vagrantfiles that use plugins to work. [GH-2388]
   - core: global flags are ignored past the "--" on the CLI. [GH-2491]
-  - core: provisoining will properly happen if `up` failed. [GH-2488]
+  - core: provisioning will properly happen if `up` failed. [GH-2488]
   - guests/freebsd: Mounting NFS folders works. [GH-2400]
   - guests/freebsd: Uses `sh` by default for shell. [GH-2485]
   - guests/linux: upstart events listening for `vagrant-mounted` won't
@@ -3036,7 +3069,7 @@ IMPROVEMENTS / BUG FIXES:
     the behavior seems different/wrong.
   - Give a nice error if `:vagrant` is used as a JSON key, since Vagrant
     uses this. [GH-661]
-  - If there is only one bridgable interface, use that without asking
+  - If there is only one bridgeable interface, use that without asking
     the user. [GH-655]
   - The shell will have color output if ANSICON is installed on Windows. [GH-666]
 
@@ -3087,7 +3120,7 @@ IMPROVEMENTS / BUG FIXES:
     port of the virtual machine.
   - If a shared folder now has a `:create` flag set to `true`, the path on the
     host will be created if it doesn't exist.
-  - Added `--force` flag to `box add`, which will overwite any existing boxes
+  - Added `--force` flag to `box add`, which will overwrite any existing boxes
     if they exist. [GH-631]
   - Added `--provision-with` to `up` which configures what provisioners run,
     by shortcut. [GH-367]

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-unbundled (2.0.3.0)
+    vagrant-unbundled (2.0.4.0)
       childprocess (~> 0.6.0)
       erubis (~> 2.7.0)
       hashicorp-checkpoint (~> 0.1.5)
@@ -25,6 +25,8 @@ PATH
       rest-client (~> 2.0)
       ruby_dep (<= 1.3.1)
       wdm (~> 0.1.0)
+      win32-file (~> 0.8.1)
+      win32-file-security (~> 1.0.10)
       winrm (~> 2.1)
       winrm-elevated (~> 1.1)
       winrm-fs (~> 1.0)
@@ -40,11 +42,13 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
-    domain_name (0.5.20170404)
+    domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
     fake_ftp (0.1.1)
     ffi (1.9.23)
+    ffi-win32-extensions (1.0.3)
+      ffi
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
@@ -115,6 +119,16 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
+    win32-file (0.8.1)
+      ffi
+      ffi-win32-extensions
+      win32-file-stat (>= 1.4.0)
+    win32-file-security (1.0.10)
+      ffi
+      ffi-win32-extensions
+    win32-file-stat (1.5.5)
+      ffi
+      ffi-win32-extensions
     winrm (2.2.3)
       builder (>= 2.1.2)
       erubis (~> 2.7)

data/README.md

@@ -4,6 +4,7 @@
 * Source: [https://github.com/hashicorp/vagrant](https://github.com/hashicorp/vagrant)
 * [![Gitter chat](https://badges.gitter.im/mitchellh/vagrant.png)](https://gitter.im/mitchellh/vagrant)
 * Mailing list: [Google Groups](https://groups.google.com/group/vagrant-up)
+* IRC: #vagrant on freenode.org
 
 Vagrant is a tool for building and distributing development environments.
 

data/bin/vagrant

@@ -9,7 +9,7 @@ Signal.trap("INT") { abort }
 argv = ARGV.dup
 argv_extra = []
 
-# These will be the options that are passed to initialze the Vagrant
+# These will be the options that are passed to initialize the Vagrant
 # environment.
 opts = {}
 

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

@@ -6,7 +6,7 @@ module Vagrant
   module Action
     module Builtin
       # This built-in middleware handles the `box` setting by verifying
-      # the box is already installed, dowloading the box if it isn't,
+      # the box is already installed, downloading the box if it isn't,
       # updating the box if it is requested, etc.
       class HandleBox
         @@big_lock = Mutex.new

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

@@ -121,7 +121,7 @@ module Vagrant
             @env[:ui].info I18n.t("vagrant.actions.general.package.packaging", file: from)
             FileUtils.mkdir_p(to.parent)
 
-            # Copy direcotry contents recursively.
+            # Copy directory contents recursively.
             if File.directory?(from)
               FileUtils.cp_r(Dir.glob(from), to.parent, preserve: true)
             else

data/lib/vagrant/action.rb

@@ -36,7 +36,9 @@ module Vagrant
     end
 
     module General
-      autoload :Package,  'vagrant/action/general/package'
+      autoload :Package, 'vagrant/action/general/package'
+      autoload :PackageSetupFiles, 'vagrant/action/general/package_setup_files'
+      autoload :PackageSetupFolders, 'vagrant/action/general/package_setup_folders'
     end
 
     # This is the action that will add a box from a URL. This middleware

data/lib/vagrant/alias.rb

@@ -0,0 +1,56 @@
+require "vagrant/registry"
+
+module Vagrant
+  # This class imports and processes CLI aliases stored in ~/.vagrant.d/aliases
+  class Alias
+    def initialize(env)
+      @aliases = Registry.new
+      @env = env
+
+      if env.aliases_path.file?
+        env.aliases_path.readlines.each do |line|
+          # separate keyword-command pairs
+          keyword, command = interpret(line)
+
+          if keyword && command
+            register(keyword, command)
+          end
+        end
+      end
+    end
+
+    # This returns all the registered alias commands.
+    def commands
+      @aliases
+    end
+
+    # This interprets a raw line from the aliases file.
+    def interpret(line)
+      # is it a comment?
+      return nil if line.strip.start_with?("#")
+
+      keyword, command = line.split("=", 2).collect(&:strip)
+
+      # validate the keyword
+      if keyword.match(/\s/i)
+        raise Errors::AliasInvalidError, alias: line, message: "Alias keywords must not contain any whitespace."
+      end
+
+      [keyword, command]
+    end
+
+    # This registers an alias.
+    def register(keyword, command)
+      @aliases.register(keyword.to_sym) do
+        lambda do |args|
+          # directly execute shell commands
+          if command.start_with?("!")
+            return Util::SafeExec.exec "#{command[1..-1]} #{args.join(" ")}".strip
+          end
+
+          return CLI.new(command.split.concat(args), @env).execute
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/bundler.rb

@@ -307,7 +307,7 @@ module Vagrant
 
       # Install all remote gems into plugin path. Set the installer to ignore dependencies
       # as we know the dependencies are satisfied and it will attempt to validate a gem's
-      # dependencies are satisified by gems in the install directory (which will likely not
+      # dependencies are satisfied by gems in the install directory (which will likely not
       # be true)
       result = request_set.install_into(plugin_gem_path.to_s, true,
         ignore_dependencies: true,

data/lib/vagrant/capability_host.rb

@@ -5,7 +5,7 @@ module Vagrant
   #
   # Capabilities allow small pieces of functionality to be plugged in using
   # the Vagrant plugin model. Capabilities even allow for a certain amount
-  # of inheritence, where only a subset of capabilities may be implemented but
+  # of inheritance, where only a subset of capabilities may be implemented but
   # a parent implements the rest.
   #
   # Capabilities are used heavily in Vagrant for host/guest interactions. For

data/lib/vagrant/cli.rb

@@ -28,6 +28,14 @@ module Vagrant
       command_plugin = nil
       if @sub_command
         command_plugin = Vagrant.plugin("2").manager.commands[@sub_command.to_sym]
+
+        if !command_plugin
+          alias_command = Alias.new(@env).commands[@sub_command.to_sym]
+
+          if alias_command
+            return alias_command.call(@sub_args)
+          end
+        end
       end
 
       if !command_plugin || !@sub_command

data/lib/vagrant/config/version_base.rb

@@ -1,7 +1,7 @@
 module Vagrant
   module Config
     # This is the base class for any configuration versions, and includes
-    # the stub methods that configuaration versions must implement. Vagrant
+    # the stub methods that configuration versions must implement. Vagrant
     # supports configuration versioning so that backwards compatibility can be
     # maintained for past Vagrantfiles while newer configurations are added.
     # Vagrant only introduces new configuration versions for major versions

data/lib/vagrant/environment.rb

@@ -56,6 +56,9 @@ module Vagrant
     # The directory where temporary files for Vagrant go.
     attr_reader :tmp_path
 
+    # File where command line aliases go.
+    attr_reader :aliases_path
+
     # The directory where boxes are stored.
     attr_reader :boxes_path
 
@@ -124,6 +127,9 @@ module Vagrant
       @tmp_path   = @home_path.join("tmp")
       @machine_index_dir = @data_dir.join("machine-index")
 
+      @aliases_path = Pathname.new(ENV["VAGRANT_ALIAS_FILE"]).expand_path if ENV.key?("VAGRANT_ALIAS_FILE")
+      @aliases_path ||= @home_path.join("aliases")
+
       # Prepare the directories
       setup_home_path
 
@@ -446,7 +452,7 @@ module Vagrant
         temp_dir_root: tmp_path)
     end
 
-    # Returns the {Config::Loader} that can be used to load Vagrantflies
+    # Returns the {Config::Loader} that can be used to load Vagrantfiles
     # given the settings of this environment.
     #
     # @return [Config::Loader]

data/lib/vagrant/errors.rb

@@ -108,6 +108,10 @@ module Vagrant
       error_key(:active_machine_with_different_provider)
     end
 
+    class AliasInvalidError < VagrantError
+      error_key(:alias_invalid_error)
+    end
+
     class BatchMultiError < VagrantError
       error_key(:batch_multi_error)
     end

data/lib/vagrant/host.rb

@@ -1,7 +1,7 @@
 require "vagrant/capability_host"
 
 module Vagrant
-  # This class handles host-OS specific interations. It is responsible for
+  # This class handles host-OS specific interactions. It is responsible for
   # detecting the proper host OS implementation and delegating capabilities
   # to plugins.
   #

data/lib/vagrant/machine.rb

@@ -456,7 +456,7 @@ module Vagrant
       info[:password] = @config.ssh.password if @config.ssh.password
       info[:extra_args] = @config.ssh.extra_args if @config.ssh.extra_args
 
-      # We also set some fields that are purely controlled by Varant
+      # We also set some fields that are purely controlled by Vagrant
       info[:forward_agent] = @config.ssh.forward_agent
       info[:forward_x11]   = @config.ssh.forward_x11
       info[:forward_env]   = @config.ssh.forward_env

data/lib/vagrant/machine_index.rb

@@ -404,7 +404,7 @@ module Vagrant
       end
 
       # Returns boolean true if this entry appears to be valid.
-      # The critera for being valid:
+      # The criteria for being valid:
       #
       #   * Vagrantfile directory exists
       #   * Vagrant environment contains a machine with this

data/lib/vagrant/plugin/v1/guest.rb

@@ -3,7 +3,7 @@ module Vagrant
     module V1
       # The base class for a guest. A guest represents an installed system
       # within a machine that Vagrant manages. There are some portions of
-      # Vagrant which are OS-specific such as mountaing shared folders and
+      # Vagrant which are OS-specific such as mounting shared folders and
       # halting the machine, and this abstraction allows the implementation
       # for these to be separate from the core of Vagrant.
       class Guest

data/lib/vagrant/plugin/v1/host.rb

@@ -3,7 +3,7 @@ module Vagrant
     module V1
       # Base class for a host in Vagrant. A host class contains functionality
       # that is specific to a specific OS that is running Vagrant. This
-      # abstraction is done becauase there is some host-specific logic that
+      # abstraction is done because there is some host-specific logic that
       # Vagrant must do in some cases.
       class Host
         # This returns true/false depending on if the current running system

data/lib/vagrant/plugin/v1/plugin.rb

@@ -44,7 +44,7 @@ module Vagrant
           result
         end
 
-        # Sets a human-friendly descrition of the plugin.
+        # Sets a human-friendly description of the plugin.
         #
         # @param [String] value Description of the plugin.
         # @return [String] Description of the plugin.

data/lib/vagrant/plugin/v1/provider.rb

@@ -21,7 +21,7 @@ module Vagrant
           nil
         end
 
-        # This method is called if the underying machine ID changes. Providers
+        # This method is called if the underlying machine ID changes. Providers
         # can use this method to load in new data for the actual backing
         # machine or to realize that the machine is now gone (the ID can
         # become `nil`). No parameters are given, since the underlying machine

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

@@ -7,7 +7,7 @@ module Vagrant
       # own form of plugin.
       #
       # The guest class itself is only responsible for detecting itself,
-      # and may provide helpers for the capabilties.
+      # and may provide helpers for the capabilities.
       class Guest
         # This method is called when the machine is booted and has communication
         # capabilities in order to detect whether this guest operating system

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

@@ -3,7 +3,7 @@ module Vagrant
     module V2
       # Base class for a host in Vagrant. A host class contains functionality
       # that is specific to a specific OS that is running Vagrant. This
-      # abstraction is done becauase there is some host-specific logic that
+      # abstraction is done because there is some host-specific logic that
       # Vagrant must do in some cases.
       class Host
         # This returns true/false depending on if the current running system

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

@@ -53,7 +53,7 @@ module Vagrant
           result
         end
 
-        # Sets a human-friendly descrition of the plugin.
+        # Sets a human-friendly description of the plugin.
         #
         # @param [String] value Description of the plugin.
         # @return [String] Description of the plugin.

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

@@ -55,7 +55,7 @@ module Vagrant
           nil
         end
 
-        # This method is called if the underying machine ID changes. Providers
+        # This method is called if the underlying machine ID changes. Providers
         # can use this method to load in new data for the actual backing
         # machine or to realize that the machine is now gone (the ID can
         # become `nil`). No parameters are given, since the underlying machine

data/lib/vagrant/shared_helpers.rb

@@ -15,7 +15,7 @@ module Vagrant
   # Max number of seconds to wait for joining an active thread.
   #
   # @return [Integer]
-  # @note This is not the maxium time for a thread to complete.
+  # @note This is not the maximum time for a thread to complete.
   THREAD_MAX_JOIN_TIMEOUT = 60
 
   # This holds a global lock for the duration of the block. This should
@@ -93,7 +93,7 @@ module Vagrant
   #
   # @return [Pathname]
   def self.user_data_path
-    # Use user spcified env var if available
+    # Use user specified env var if available
     path = ENV["VAGRANT_HOME"]
 
     # On Windows, we default to the USERPROFILE directory if it
@@ -134,15 +134,36 @@ module Vagrant
   #
   # @return [boolean] enabled or not
   def self.enable_resolv_replace
-    if !ENV["VAGRANT_DISABLE_RESOLV_REPLACE"]
-      begin
-        require "resolv-replace"
-        true
-      rescue
+    if ENV["VAGRANT_ENABLE_RESOLV_REPLACE"]
+      if !ENV["VAGRANT_DISABLE_RESOLV_REPLACE"]
+        begin
+          require "resolv-replace"
+          true
+        rescue
+          false
+        end
+      else
         false
       end
-    else
-      false
     end
   end
+
+  # Set the global logger
+  #
+  # @param log Logger
+  # @return [Logger]
+  def self.global_logger=(log)
+    @_global_logger = log
+  end
+
+  # Get the global logger instance
+  #
+  # @return [Logger]
+  def self.global_logger
+    if @_global_logger.nil?
+      require "log4r"
+      @_global_logger = Log4r::Logger.new("vagrant::global")
+    end
+    @_global_logger
+  end
 end

data/lib/vagrant/util/checkpoint_client.rb

@@ -39,6 +39,10 @@ module Vagrant
         rescue LoadError
           @logger.warn("checkpoint library not found. disabling.")
         end
+        if ENV["VAGRANT_CHECKPOINT_DISABLE"]
+          @logger.debug("checkpoint disabled via explicit user request")
+          @enabled = false
+        end
         @files = {
           signature: env.data_dir.join("checkpoint_signature"),
           cache: env.data_dir.join("checkpoint_cache")
@@ -74,6 +78,10 @@ module Vagrant
         if enabled && @checkpoint_thread.nil?
           logger.debug("starting plugin check")
           @checkpoint_thread = Thread.new do
+            Thread.current.abort_on_exception = false
+            if Thread.current.respond_to?(:report_on_exception=)
+              Thread.current.report_on_exception = false
+            end
             begin
               Thread.current[:result] = Checkpoint.check(
                 product: "vagrant",

data/lib/vagrant/util/downloader.rb

@@ -302,7 +302,7 @@ module Vagrant
         result
       end
 
-      # Returns the varoius cURL and subprocess options.
+      # Returns the various cURL and subprocess options.
       #
       # @return [Array<Array, Hash>]
       def options

data/lib/vagrant/util/platform.rb

@@ -223,7 +223,15 @@ module Vagrant
             # Traverse each part and join it into the resulting path
             original.each do |single|
               Dir.entries(path).each do |entry|
-                if entry.downcase == single.encode('filesystem').downcase
+                begin
+                  single = single.encode("filesystem").to_s
+                rescue ArgumentError => err
+                  Vagrant.global_logger.warn("path encoding failed - part=#{single} err=#{err.class} msg=#{err}")
+                  # NOTE: Depending on the Windows environment the above
+                  # encode will generate an "input string invalid" when
+                  # attempting to encode. If that happens, continue on
+                end
+                if entry.downcase == single.downcase
                   path = path.join(entry)
                 end
               end
@@ -553,9 +561,9 @@ module Vagrant
         def wsl_validate_matching_vagrant_versions!
           valid = false
           if Util::Which.which("vagrant.exe")
-            result = Util::Subprocess.execute("vagrant.exe", "version")
+            result = Util::Subprocess.execute("vagrant.exe", "--version")
             if result.exit_code == 0
-              windows_version = result.stdout.match(/Installed Version: (?<version>[\w.-]+)/)
+              windows_version = result.stdout.match(/Vagrant (?<version>[\w.-]+)/)
               if windows_version
                 windows_version = windows_version[:version].strip
                 valid = windows_version == Vagrant::VERSION

data/lib/vagrant/util/powershell.rb

@@ -11,6 +11,8 @@ module Vagrant
     class PowerShell
       # NOTE: Version checks are only on Major
       MINIMUM_REQUIRED_VERSION = 3
+      # Number of seconds to wait while attempting to get powershell version
+      DEFAULT_VERSION_DETECTION_TIMEOUT = 30
       LOGGER = Log4r::Logger.new("vagrant::util::powershell")
 
       # @return [String|nil] a powershell executable, depending on environment
@@ -101,8 +103,15 @@ module Vagrant
           ].flatten
 
           version = nil
+          timeout = ENV["VAGRANT_POWERSHELL_VERSION_DETECTION_TIMEOUT"].to_i
+          if timeout < 1
+            timeout = DEFAULT_VERSION_DETECTION_TIMEOUT
+          end
           begin
-            r = Subprocess.execute(*command, notify: [:stdout, :stderr], timeout: 10) {|io_name,data| version = data}
+            r = Subprocess.execute(*command,
+              notify: [:stdout, :stderr],
+              timeout: timeout,
+            ) {|io_name,data| version = data}
           rescue Vagrant::Util::Subprocess::TimeoutExceeded
             LOGGER.debug("Timeout exceeded while attempting to determine version of Powershell.")
           end
@@ -183,6 +192,13 @@ module Vagrant
           Subprocess::Result.new(code, r_stdout, r_stderr)
         end
       end
+
+      # @private
+      # Reset the cached values for platform. This is not considered a public
+      # API and should only be used for testing.
+      def self.reset!
+        instance_variables.each(&method(:remove_instance_variable))
+      end
     end
   end
 end