vagrant-unbundled 2.2.2.0 → 2.2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '092370f794df41aa0635fd8a28ca6cfb3b3bda4b23b073bbab6387cf3e5bff1b'
-  data.tar.gz: de1fccf9d6d443c4338db2870508c36fe0dd0807069be31898124fee88c7a5a4
+  metadata.gz: a7c0bf3ce6e046a50a42bed6404f937acebe5ec11fa7b432ae6860b327c89d16
+  data.tar.gz: 3fa442fe4c0355c68710eabe894c6414cabaf57fe151879f4356d3e9b038f08f
 SHA512:
-  metadata.gz: 6d45f2df2f9252d0de117c8f019ca22a418fdd58c1f5f8f9e6996f4e6e1b0e69a00be132324a80f4edc8babe724b7a5f5ff282eee71f8e05c5903e785bf56f56
-  data.tar.gz: adec6283e9e94b6585ba7ba4e19b203806503fed7cdd6562be94caa86ff89a08797b8e94b5e744e4eab3580b692831071460c7b145f853536bc2f2c054c0ddac
+  metadata.gz: e57154c0e2284a25e5d817eaab04b3d7c11c7b5c7db2e38487a734a7016d478c23b98a2234d02d2c530a80303ad7659cf10a7a50f4a2100375d0d6ee4de35d88
+  data.tar.gz: e11f8591651796f956e89398fb85580545ddab5623ab9dee0dfce2b1a7a0325e51a6e8399daf61ee174b8748087ca82dbdbcc0a1c75060efec0e2b817e78ab3f

data/.travis.yml

@@ -13,6 +13,7 @@ rvm:
   - 2.3.8
   - 2.4.5
   - 2.5.3
+  - 2.6.0
 
 branches:
   only:

data/CHANGELOG.md

@@ -1,3 +1,44 @@
+## 2.2.3 (January 9, 2019)
+
+FEATURES:
+
+- host/void: Add host support for void linux [GH-10012]
+
+IMPROVEMENTS:
+
+- command/rsync-auto: Prevent crash on post-rsync command failure [GH-10515]
+- command/snapshot: Raise error for bad subcommand [GH-10470]
+- command/package: Ensure temp dir for package command is cleaned up [GH-10479]
+- command/powershell: Support running elevated commands [GH-10528]
+- communicator/ssh: Add `config` and `remote_user` options [GH-10496]
+- core: Display version update on stderr instead of stdout [GH-10482]
+- core: Add experimental feature flag [GH-10485]
+- core: Show box version during box outdated check [GH-10573]
+- guest/windows: Modify elevated username only on username failure [GH-10488]
+- host/windows: Prevent SMB setup commands from becoming too long [GH-10489]
+- host/windows: Automatically answer yes when pruning SMB shares [GH-10524]
+- provisioners/file: Show source and destination locations with file provisioner [GH-10570]
+- provisioners/salt: Validate that `install_type` is set if `version` is specified [GH-10474]
+- provisioners/salt: Update default install version [GH-10537]
+- provisioners/shell: Add `reboot` option for rebooting supported guest [GH-10532]
+- synced_folders/rsync: Support using rsync `--chown` option [GH-10529]
+- util/guest_inspection: Validate hostnamectl command works when detected [GH-10512]
+- util/platform: Use wslpath command for customized root on WSL [GH-10574]
+
+BUG FIXES:
+
+- command/cloud publish: Ensure box file exists before path expanding [GH-10468]
+- command/cloud publish: Catch InvalidVersion errors from vagrant_cloud client [GH-10513]
+- command/snapshot: Retain consistent provisioning behavior across all commands [GH-10490]
+- command/validate: Bypass install checks for validating configs with the `--ignore-provider` flag [GH-10467]
+- communicator/ssh: Fix garbage output detection [GH-10571]
+- guest/alt: Fix network configuration errors [GH-10527]
+- guest/coreos: Fix grep command for network interface of CoreOS guest [GH-10554]
+- guest/freebsd: Fix defaultrouter rcvar in static network template [GH-10469]
+- guest/redhat: Fix network configuration errors [GH-10527]
+- providers/virtualbox: Adjust version requirement for NIC warning [GH-10486]
+- util/powershell: Use correct Base64 encoding for encoded commands [GH-10487]
+
 ## 2.2.2 (November 27, 2018)
 
 BUG FIXES:

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/hashicorp/vagrant-spec.git
-  revision: 94a9d31ba18b4130b14da12a2f7b4001c3d2ff12
+  revision: abfc34474d122235d56e4c6b6fb5d3e35bedfa90
   specs:
     vagrant-spec (0.0.1)
       childprocess (~> 0.6.0)
@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-unbundled (2.2.2.0)
+    vagrant-unbundled (2.2.3.0)
       bcrypt_pbkdf (~> 1.0.0)
       childprocess (~> 0.6.0)
       ed25519 (~> 1.2.4)
@@ -22,12 +22,12 @@ PATH
       log4r (~> 1.1.9, < 1.1.11)
       net-scp (~> 1.2.0)
       net-sftp (~> 2.1)
-      net-ssh (~> 5.0.0)
+      net-ssh (~> 5.1.0)
       rb-kqueue (~> 0.2.0)
       rest-client (>= 1.6.0, < 3.0)
       ruby_dep (<= 1.3.1)
       rubyzip (~> 1.2.2)
-      vagrant_cloud (~> 2.0.0)
+      vagrant_cloud (~> 2.0.2)
       wdm (~> 0.1.0)
       winrm (~> 2.1)
       winrm-elevated (~> 1.1)
@@ -42,7 +42,7 @@ GEM
     builder (3.2.3)
     childprocess (0.6.3)
       ffi (~> 1.0, >= 1.0.11)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.4)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
@@ -51,12 +51,12 @@ GEM
     ed25519 (1.2.4)
     erubis (2.7.0)
     fake_ftp (0.1.1)
-    ffi (1.9.25)
+    ffi (1.10.0)
     gssapi (1.2.0)
       ffi (>= 1.0.1)
     gyoku (1.3.1)
       builder (>= 2.1.2)
-    hashdiff (0.3.7)
+    hashdiff (0.3.8)
     hashicorp-checkpoint (0.1.5)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
@@ -80,14 +80,14 @@ GEM
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (5.0.2)
+    net-ssh (5.1.0)
     netrc (0.11.0)
     nori (2.6.0)
     public_suffix (3.0.3)
     rake (12.0.0)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
     rb-kqueue (0.2.5)
       ffi (>= 0.5.0)
     rest-client (2.0.2)
@@ -118,14 +118,14 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    vagrant_cloud (2.0.1)
+    vagrant_cloud (2.0.2)
       rest-client (~> 2.0.2)
     wdm (0.1.1)
     webmock (2.3.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    winrm (2.3.0)
+    winrm (2.3.1)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)
@@ -134,10 +134,10 @@ GEM
       logging (>= 1.6.1, < 3.0)
       nori (~> 2.0)
       rubyntlm (~> 0.6.0, >= 0.6.1)
-    winrm-elevated (1.1.0)
+    winrm-elevated (1.1.1)
       winrm (~> 2.0)
       winrm-fs (~> 1.0)
-    winrm-fs (1.3.1)
+    winrm-fs (1.3.2)
       erubis (~> 2.7)
       logging (>= 1.6.1, < 3.0)
       rubyzip (~> 1.1)
@@ -156,4 +156,4 @@ DEPENDENCIES
   webmock (~> 2.3.1)
 
 BUNDLED WITH
-   1.17.1
+   2.0.1

data/RELEASE.md

@@ -38,7 +38,7 @@ targeted at Vagrant core members who have the ability to cut a release.
 
 1. Update `website/config.rb` to point to the latest version, commit, and push.
 
-1. Tell HashiBot to deploy in ``#deploys`
+1. Tell HashiBot to deploy in `#deploys`
 
     ```
     hashibot deploy vagrant

data/bin/vagrant

@@ -89,6 +89,7 @@ begin
   require 'vagrant/bundler'
   require 'vagrant/cli'
   require 'vagrant/util/platform'
+  require 'vagrant/util/experimental'
 
   # Schedule the cleanup of things
   at_exit(&Vagrant::Bundler.instance.method(:deinit))
@@ -159,6 +160,23 @@ begin
     #env.ui.warn(I18n.t("vagrant.general.not_in_installer") + "\n", prefix: false)
   end
 
+  # Acceptable experimental flag values include:
+  #
+  # Unset  - Disables experimental features
+  # 0      - Disables experimental features
+  # 1      - Enables all features
+  # String - Enables one or more features, separated by commas
+  if Vagrant::Util::Experimental.enabled?
+    experimental = Vagrant::Util::Experimental.features_requested
+    ui = Vagrant::UI::Prefixed.new(env.ui, "vagrant")
+    logger.debug("Experimental flag is enabled")
+    if Vagrant::Util::Experimental.global_enabled?
+      ui.warn(I18n.t("vagrant.general.experimental.all"), bold: true, prefix: true, channel: :error)
+    else
+      ui.warn(I18n.t("vagrant.general.experimental.features", features: experimental.join(", ")), bold: true, prefix: true, channel: :error)
+    end
+  end
+
   begin
     # Execute the CLI interface, and exit with the proper error code
     exit_status = env.cli(argv)

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

@@ -51,7 +51,8 @@ module Vagrant
 
           env[:ui].output(I18n.t(
             "vagrant.box_outdated_checking_with_refresh",
-            name: box.name))
+            name: box.name,
+            version: box.version))
           update = nil
           begin
             update = box.has_update?(constraints, download_options: download_options)

data/lib/vagrant/errors.rb

@@ -160,6 +160,10 @@ module Vagrant
       error_key(:box_config_changing_box)
     end
 
+    class BoxFileNotExist < VagrantError
+      error_key(:box_file_not_exist)
+    end
+
     class BoxMetadataCorrupted < VagrantError
       error_key(:box_metadata_corrupted)
     end
@@ -664,6 +668,10 @@ module Vagrant
       error_key(:push_strategy_not_provided)
     end
 
+    class RSyncPostCommandError < VagrantError
+      error_key(:rsync_post_command_error)
+    end
+
     class RSyncError < VagrantError
       error_key(:rsync_error)
     end

data/lib/vagrant/machine.rb

@@ -452,9 +452,11 @@ module Vagrant
       info[:keys_only] ||= @config.ssh.default.keys_only
       info[:verify_host_key] ||= @config.ssh.default.verify_host_key
       info[:username] ||= @config.ssh.default.username
+      info[:remote_user] ||= @config.ssh.default.remote_user
       info[:compression] ||= @config.ssh.default.compression
       info[:dsa_authentication] ||= @config.ssh.default.dsa_authentication
       info[:extra_args] ||= @config.ssh.default.extra_args
+      info[:config] ||= @config.ssh.default.config
 
       # We set overrides if they are set. These take precedence over
       # provider-returned data.
@@ -466,7 +468,9 @@ module Vagrant
       info[:dsa_authentication] = @config.ssh.dsa_authentication
       info[:username] = @config.ssh.username if @config.ssh.username
       info[:password] = @config.ssh.password if @config.ssh.password
+      info[:remote_user] = @config.ssh.remote_user if @config.ssh.remote_user
       info[:extra_args] = @config.ssh.extra_args if @config.ssh.extra_args
+      info[:config] = @config.ssh.config if @config.ssh.config
 
       # We also set some fields that are purely controlled by Vagrant
       info[:forward_agent] = @config.ssh.forward_agent

data/lib/vagrant/util/checkpoint_client.rb

@@ -162,8 +162,8 @@ module Vagrant
         ui = Vagrant::UI::Prefixed.new(env.ui, "vagrant")
         if latest_version > installed_version
           @logger.info("new version of Vagrant available - #{latest_version}")
-          ui.info(I18n.t("vagrant.version_upgrade_available", latest_version: latest_version, installed_version: installed_version))
-          env.ui.info("")
+          ui.info(I18n.t("vagrant.version_upgrade_available", latest_version: latest_version, installed_version: installed_version), channel: :error)
+          env.ui.info("", channel: :error)
         else
           @logger.debug("vagrant is currently up to date")
         end

data/lib/vagrant/util/experimental.rb

@@ -0,0 +1,76 @@
+module Vagrant
+  module Util
+    class Experimental
+      class << self
+        # A method for determining if the experimental flag has been enabled with
+        # any features
+        #
+        # @return [Boolean]
+        def enabled?
+          if !defined?(@_experimental)
+            experimental = features_requested
+            if experimental.size >= 1 && experimental.first != "0"
+              @_experimental = true
+            else
+              @_experimental = false
+            end
+          end
+          @_experimental
+        end
+
+        # A method for determining if all experimental features have been enabled
+        # by either a global enabled value "1" or all features explicitly enabled.
+        #
+        # @return [Boolean]
+        def global_enabled?
+          if !defined?(@_global_enabled)
+            experimental = features_requested
+            if experimental.size == 1 && experimental.first == "1"
+              @_global_enabled = true
+            else
+              @_global_enabled = false
+            end
+          end
+          @_global_enabled
+        end
+
+        # A method for Vagrant internals to determine if a given feature
+        # has been abled by the user, is a valid feature flag and can be used.
+        #
+        # @param [String] feature
+        # @return [Boolean] - A hash containing the original array and if it is valid
+        def feature_enabled?(feature)
+          experimental = features_requested
+          feature = feature.to_s
+
+          return global_enabled? || experimental.include?(feature)
+        end
+
+        # Returns the features requested for the experimental flag
+        #
+        # @return [Array] - Returns an array of requested experimental features
+        def features_requested
+          if !defined?(@_requested_features)
+            @_requested_features = ENV["VAGRANT_EXPERIMENTAL"].to_s.downcase.split(',')
+          end
+          @_requested_features
+        end
+
+        # A function to guard experimental blocks of code from being executed
+        #
+        # @param [Array] features - Array of features to guard a method with
+        # @param [Block] block - Block of ruby code to be guarded against
+        def guard_with(*features, &block)
+          yield if block_given? && features.any? {|f| feature_enabled?(f)}
+        end
+
+        # @private
+        # Reset the cached values for platform. This is not considered a public
+        # API and should only be used for testing.
+        def reset!
+          instance_variables.each(&method(:remove_instance_variable))
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/util/guest_inspection.rb

@@ -36,8 +36,12 @@ module Vagrant
         #
         # @param [Vagrant::Plugin::V2::Communicator] comm Guest communicator
         # @return [Boolean]
+        # NOTE: This test includes actually calling `hostnamectl` to verify
+        # that it is in working order. This prevents attempts to use the
+        # hostnamectl command when it is available, but dbus is not which
+        # renders the command useless
         def hostnamectl?(comm)
-          comm.test("command -v hostnamectl")
+          comm.test("command -v hostnamectl && hostnamectl")
         end
 
         ## netplan helpers

data/lib/vagrant/util/platform.rb

@@ -366,6 +366,12 @@ module Vagrant
               # Lowercase the drive letter, skip the next symbol (which is a
               # colon from a Windows path) and convert path to UNIX style.
               check_path = "/mnt/#{path[0, 1].downcase}#{path[2..-1].tr('\\', '/')}/rootfs"
+              begin
+                process = Subprocess.execute("wslpath", "-u", "-a", path)
+                check_path = "#{process.stdout.chomp}/rootfs" if process.exit_code == 0
+              rescue Errors::CommandUnavailable => e
+                # pass
+              end
 
               logger.debug("checking `#{path}` for current WSL instance")
               begin
@@ -432,6 +438,12 @@ module Vagrant
           path = path.to_s
           if wsl? && wsl_windows_access? && !path.match(/^[a-zA-Z]:/)
             path = File.expand_path(path)
+            begin
+              process = Subprocess.execute("wslpath", "-w", "-a", path)
+              return process.stdout.chomp if process.exit_code == 0
+            rescue Errors::CommandUnavailable => e
+              # pass
+            end
             if wsl_path?(path)
               parts = path.split("/")
               parts.delete_if(&:empty?)
@@ -502,6 +514,14 @@ module Vagrant
         def wsl_windows_accessible_path
           if !defined?(@_wsl_windows_accessible_path)
             access_path = ENV["VAGRANT_WSL_WINDOWS_ACCESS_USER_HOME_PATH"]
+            if access_path.to_s.empty?
+              begin
+                process = Subprocess.execute("wslpath", "-u", "-a", wsl_windows_home)
+                access_path = process.stdout.chomp if process.exit_code == 0
+              rescue Errors::CommandUnavailable => e
+                # pass
+              end
+            end
             if access_path.to_s.empty?
               access_path = wsl_windows_home.gsub("\\", "/").sub(":", "")
               access_path[0] = access_path[0].downcase

data/lib/vagrant/util/powershell.rb

@@ -217,14 +217,14 @@ module Vagrant
           stderr = File.join(dpath, "stderr.txt")
 
           script = "& #{arg_list} ; exit $LASTEXITCODE;"
-          script_content = Base64.urlsafe_encode64(script.encode("UTF-16LE", "UTF-8"))
+          script_content = Base64.strict_encode64(script.encode("UTF-16LE", "UTF-8"))
 
           # Wrap so we can redirect output to read later
           wrapper = "$p = Start-Process -FilePath powershell -ArgumentList @('-NoLogo', '-NoProfile', " \
             "'-NonInteractive', '-ExecutionPolicy', 'Bypass', '-EncodedCommand', '#{script_content}') " \
             "-PassThru -WindowStyle Hidden -Wait -RedirectStandardOutput '#{stdout}' -RedirectStandardError '#{stderr}'; " \
             "if($p){ exit $p.ExitCode; }else{ exit 1 }"
-          wrapper_content = Base64.urlsafe_encode64(wrapper.encode("UTF-16LE", "UTF-8"))
+          wrapper_content = Base64.strict_encode64(wrapper.encode("UTF-16LE", "UTF-8"))
 
           powerup = "$p = Start-Process -FilePath powershell -ArgumentList @('-NoLogo', '-NoProfile', " \
             "'-NonInteractive', '-ExecutionPolicy', 'Bypass', '-EncodedCommand', '#{wrapper_content}') " \

data/lib/vagrant/util/ssh.rb

@@ -178,6 +178,10 @@ module Vagrant
             "-o", "ForwardX11Trusted=yes"]
         end
 
+        if ssh_info[:config]
+          command_options += ["-F", ssh_info[:config]]
+        end
+
         if ssh_info[:proxy_command]
           command_options += ["-o", "ProxyCommand=#{ssh_info[:proxy_command]}"]
         end

data/plugins/commands/cloud/publish.rb

@@ -9,7 +9,7 @@ module VagrantPlugins
           options = {}
 
           opts = OptionParser.new do |o|
-            o.banner = "Usage: vagrant cloud publish [options] organization/box-name version provider-name [provider-file]"
+            o.banner = "Usage: vagrant cloud publish [options] organization/box-name version provider-name provider-file"
             o.separator ""
             o.separator "Create and release a new Vagrant Box on Vagrant Cloud"
             o.separator ""
@@ -48,19 +48,26 @@ module VagrantPlugins
           # Parse the options
           argv = parse_options(opts)
           return if !argv
+
           if argv.empty? || argv.length > 4 || argv.length < 3
             raise Vagrant::Errors::CLIInvalidUsage,
               help: opts.help.chomp
           end
 
-          @client = VagrantPlugins::CloudCommand::Util.client_login(@env, options[:username])
-
           box = argv.first.split('/', 2)
           org = box[0]
           box_name = box[1]
           version = argv[1]
           provider_name = argv[2]
-          box_file = argv[3] # path expand
+          box_file = argv[3]
+
+          if !options[:url] && !File.file?(box_file)
+            raise Vagrant::Errors::BoxFileNotExist,
+              file: box_file
+          end
+
+          @client = VagrantPlugins::CloudCommand::Util.client_login(@env, options[:username])
+
           publish_box(org, box_name, version, provider_name, box_file, options, @client.token)
         end
 
@@ -120,6 +127,10 @@ module VagrantPlugins
               @env.ui.error(e)
               return 1
             end
+          rescue VagrantCloud::InvalidVersion => e
+            @env.ui.error(I18n.t("cloud_command.errors.publish.fail", org: org, box_name: box_name))
+            @env.ui.error(e)
+            return 1
           end
 
           begin

data/plugins/commands/package/command.rb

@@ -87,7 +87,10 @@ module VagrantPlugins
           acc
         end
 
-        vm.action(:package, opts)
+        env = vm.action(:package, opts)
+        temp_dir = env["export.temp_dir"]
+      ensure
+        FileUtils.rm_rf(temp_dir) if temp_dir
       end
     end
   end

data/plugins/commands/powershell/command.rb

@@ -26,6 +26,10 @@ module VagrantPlugins
           o.on("-c", "--command COMMAND", "Execute a powershell command directly") do |c|
             options[:command] = c
           end
+
+          o.on("-e", "--elevated", "Execute a powershell command with elevated permissions") do |c|
+            options[:elevated] = true
+          end
         end
 
         # Parse out the extra args to send to the ps session, which
@@ -40,8 +44,8 @@ module VagrantPlugins
         argv = parse_options(opts)
         return if !argv
 
-        # Check if the host even supports ps remoting
-        raise Errors::HostUnsupported if !@env.host.capability?(:ps_client)
+        # Elevated option enabled means we can only execute commands
+        raise Errors::ElevatedNoCommand if !options[:command] && options[:elevated]
 
         # Execute ps session if we can
         with_target_vms(argv, single_target: true) do |machine|
@@ -49,12 +53,12 @@ module VagrantPlugins
             raise Vagrant::Errors::VMNotCreatedError
           end
 
-          if machine.config.vm.communicator != :winrm
-            raise VagrantPlugins::CommunicatorWinRM::Errors::WinRMNotReady
-          end
+          if options[:command]
+            if machine.config.vm.communicator != :winrm
+              raise VagrantPlugins::CommunicatorWinRM::Errors::WinRMNotReady
+            end
 
-          if !options[:command].nil?
-            out_code = machine.communicate.execute(options[:command].dup) do |type,data|
+            out_code = machine.communicate.execute(options[:command].dup, elevated: options[:elevated]) do |type,data|
               machine.ui.detail(data) if type == :stdout
             end
             if out_code == 0
@@ -63,6 +67,9 @@ module VagrantPlugins
             next
           end
 
+          # Check if the host even supports ps remoting
+          raise Errors::HostUnsupported if !@env.host.capability?(:ps_client)
+
           ps_info = VagrantPlugins::CommunicatorWinRM::Helper.winrm_info(machine)
           ps_info[:username] = machine.config.winrm.username
           ps_info[:password] = machine.config.winrm.password
@@ -78,7 +85,7 @@ module VagrantPlugins
           begin
             @env.host.capability(:ps_client, ps_info)
           ensure
-            if !result["PreviousTrustedHosts"].nil?
+            if result["PreviousTrustedHosts"]
               reset_ps_remoting_for(machine, ps_info)
             end
           end

data/plugins/commands/powershell/errors.rb

@@ -17,6 +17,10 @@ module VagrantPlugins
       class PowerShellError < PSCommandError
         error_key(:powershell_error)
       end
+
+      class ElevatedNoCommand < PSCommandError
+        error_key(:elevated_no_command)
+      end
     end
   end
 end

data/plugins/commands/snapshot/command/pop.rb

@@ -17,6 +17,9 @@ module VagrantPlugins
         def execute
           options = {}
           options[:snapshot_delete] = true
+          options[:provision_ignore_sentinel] = false
+          options[:snapshot_start] = true
+
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant snapshot pop [options] [vm-name]"
             o.separator ""
@@ -26,6 +29,9 @@ module VagrantPlugins
             o.on("--no-delete", "Don't delete the snapshot after the restore") do
                 options[:snapshot_delete] = false
             end
+            o.on("--no-start", "Don't start the snapshot after the restore") do
+              options[:snapshot_start] = false
+            end
           end
 
           # Parse the options

data/plugins/commands/snapshot/command/restore.rb

@@ -13,12 +13,18 @@ module VagrantPlugins
 
         def execute
           options = {}
+          options[:provision_ignore_sentinel] = false
+          options[:snapshot_start] = true
 
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant snapshot restore [options] [vm-name] <name>"
             o.separator ""
             build_start_options(o, options)
             o.separator "Restore a snapshot taken previously with snapshot save."
+
+            o.on("--no-start", "Don't start the snapshot after the restore") do
+              options[:snapshot_start] = false
+            end
           end
 
           # Parse the options

data/plugins/commands/snapshot/command/root.rb

@@ -48,13 +48,17 @@ module VagrantPlugins
         def execute
           if @main_args.include?("-h") || @main_args.include?("--help")
             # Print the help for all the commands.
-            return help
+            @env.ui.info(help, prefix: false)
+            return 0
           end
 
           # If we reached this far then we must have a subcommand. If not,
           # then we also just print the help and exit.
           command_class = @subcommands.get(@sub_command.to_sym) if @sub_command
-          return help if !command_class || !@sub_command
+          if !command_class || !@sub_command
+            raise Vagrant::Errors::CLIInvalidUsage,
+              help: help()
+          end
           @logger.debug("Invoking command class: #{command_class} #{@sub_args.inspect}")
 
           # Initialize and execute the command class
@@ -81,7 +85,7 @@ module VagrantPlugins
             opts.separator "For help on any individual subcommand run `vagrant snapshot <subcommand> -h`"
           end
 
-          @env.ui.info(opts.help, prefix: false)
+          opts.help
         end
       end
     end

data/plugins/commands/ssh_config/command.rb

@@ -55,6 +55,7 @@ module VagrantPlugins
             proxy_command: ssh_info[:proxy_command],
             ssh_command:   ssh_info[:ssh_command],
             forward_env:   ssh_info[:forward_env],
+            config:        ssh_info[:config],
           }
 
           # Render the template and output directly to STDOUT