vagrant-unbundled 2.3.2.0 → 2.3.6.0

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

@@ -16,7 +16,7 @@ module VagrantPlugins
             o.banner = "Usage: vagrant box outdated [options]"
             o.separator ""
             o.separator "Checks if there is a new version available for the box"
-            o.separator "that are you are using. If you pass in the --global flag,"
+            o.separator "that you are using. If you pass in the --global flag,"
             o.separator "all boxes will be checked for updates."
             o.separator ""
             o.separator "Options:"

data/plugins/commands/serve/command.rb

@@ -1,39 +1,37 @@
-$LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs").to_s
-$LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs/proto").to_s
-$LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs/proto/vagrant_plugin_sdk").to_s
-
-require 'vagrant/protobufs/proto/vagrant_server/server_pb'
-require 'vagrant/protobufs/proto/vagrant_server/server_services_pb'
-require 'vagrant/protobufs/proto/ruby_vagrant/ruby-server_pb'
-require 'vagrant/protobufs/proto/ruby_vagrant/ruby-server_services_pb'
-require 'vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb'
-require 'vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb'
-require 'vagrant/protobufs/proto/plugin/grpc_broker_pb'
-require 'vagrant/protobufs/proto/plugin/grpc_broker_services_pb'
-
 require "optparse"
-require 'grpc'
-require 'grpc/health/checker'
-require 'grpc/health/v1/health_services_pb'
 
 module VagrantPlugins
   module CommandServe
-    # Simple constant aliases to reduce namespace typing
-    SDK = Hashicorp::Vagrant::Sdk
-    SRV = Hashicorp::Vagrant
-    Empty = Google::Protobuf::Empty
-
     autoload :Broker, Vagrant.source_root.join("plugins/commands/serve/broker").to_s
     autoload :Client, Vagrant.source_root.join("plugins/commands/serve/client").to_s
     autoload :Mappers, Vagrant.source_root.join("plugins/commands/serve/mappers").to_s
     autoload :Service, Vagrant.source_root.join("plugins/commands/serve/service").to_s
     autoload :Type, Vagrant.source_root.join("plugins/commands/serve/type").to_s
     autoload :Util, Vagrant.source_root.join("plugins/commands/serve/util").to_s
+    autoload :SDK, Vagrant.source_root.join("plugins/commands/serve/constants").to_s
+    autoload :SRV, Vagrant.source_root.join("plugins/commands/serve/constants").to_s
+    autoload :Empty, Vagrant.source_root.join("plugins/commands/serve/constants").to_s
 
     class << self
       attr_accessor :broker
       attr_accessor :server
       attr_reader :cache
+
+      # Loads the required dependencies for this command. This is isolated
+      # into a method so that the dependencies can be loaded just in time when
+      # the command is actually executed.
+      def load_dependencies!
+        return if @dependencies_loaded
+        require 'grpc'
+        require 'grpc/health/checker'
+        require 'grpc/health/v1/health_services_pb'
+
+        # Add conversion patches
+        require Vagrant.source_root.join("plugins/commands/serve/util/direct_conversions.rb").to_s
+
+        # Mark dependencies as loaded
+        @dependencies_loaded = true
+      end
     end
     @cache = Util::Cacher.new
 
@@ -49,6 +47,9 @@ module VagrantPlugins
       end
 
       def execute
+        # Load dependencies before we start
+        CommandServe.load_dependencies!
+
         options = {
           bind: DEFAULT_BIND,
           min_port: DEFAULT_PORT_RANGE.first,
@@ -138,6 +139,3 @@ module VagrantPlugins
     end
   end
 end
-
-# Load in our conversions down here so all the autoload stuff is in place
-require Vagrant.source_root.join("plugins/commands/serve/util/direct_conversions.rb").to_s

data/plugins/commands/serve/constants.rb

@@ -0,0 +1,8 @@
+module VagrantPlugins
+  module CommandServe
+    # Simple constant aliases to reduce namespace typing
+    SDK = Hashicorp::Vagrant::Sdk
+    SRV = Hashicorp::Vagrant
+    Empty = ::Google::Protobuf::Empty
+  end
+end

data/plugins/communicators/ssh/communicator.rb

@@ -404,7 +404,7 @@ module VagrantPlugins
 
         # Set some valid auth methods. We disable the auth methods that
         # we're not using if we don't have the right auth info.
-        auth_methods = ["none", "hostbased"]
+        auth_methods = ["none", "hostbased", "keyboard-interactive"]
         auth_methods << "publickey" if ssh_info[:private_key_path]
         auth_methods << "password" if ssh_info[:password]
 
@@ -456,6 +456,15 @@ module VagrantPlugins
                   connect_opts[:remote_user] = ssh_info[:remote_user]
                 end
 
+                if @machine.config.ssh.keep_alive
+                  connect_opts[:keepalive] = true
+                  connect_opts[:keepalive_interval] = 5
+                end
+                
+                if ssh_info[:password]
+                  connect_opts[:non_interactive] = true
+                end
+
                 @logger.info("Attempting to connect to SSH...")
                 @logger.info("  - Host: #{ssh_info[:host]}")
                 @logger.info("  - Port: #{ssh_info[:port]}")
@@ -464,7 +473,7 @@ module VagrantPlugins
                 @logger.info("  - Key Path: #{ssh_info[:private_key_path]}")
                 @logger.debug("  - connect_opts: #{connect_opts}")
 
-                Net::SSH.start(ssh_info[:host], ssh_info[:username], connect_opts)
+                Net::SSH.start(ssh_info[:host], ssh_info[:username], **connect_opts)
               ensure
                 # Make sure we output the connection log
                 @logger.debug("== Net-SSH connection debug-level log START ==")
@@ -683,21 +692,6 @@ module VagrantPlugins
         end
 
         begin
-          keep_alive = nil
-
-          if machine_config_ssh.keep_alive
-            # Begin sending keep-alive packets while we wait for the script
-            # to complete. This avoids connections closing on long-running
-            # scripts.
-            keep_alive = Thread.new do
-              loop do
-                sleep 5
-                @logger.debug("Sending SSH keep-alive...")
-                connection.send_global_request("keep-alive@openssh.com")
-              end
-            end
-          end
-
           # Wait for the channel to complete
           begin
             channel.wait
@@ -711,9 +705,6 @@ module VagrantPlugins
           rescue Net::SSH::Disconnect
             raise Vagrant::Errors::SSHDisconnected
           end
-        ensure
-          # Kill the keep-alive thread
-          keep_alive.kill if keep_alive
         end
 
         # If we're in a PTY, we now finally parse the output

data/plugins/guests/solaris/cap/remove_public_key.rb

@@ -5,14 +5,14 @@ module VagrantPlugins
     module Cap
       class RemovePublicKey
         def self.remove_public_key(machine, contents)
-          # TODO: code is identical to linux/cap/remove_public_key
+          # "sed -i" is specific to GNU sed and is not a posix standard option
           contents = contents.chomp
           contents = Vagrant::Util::ShellQuote.escape(contents, "'")
 
           machine.communicate.tap do |comm|
             if comm.test("test -f ~/.ssh/authorized_keys")
               comm.execute(
-                "sed -i '/^.*#{contents}.*$/d' ~/.ssh/authorized_keys")
+                "cp ~/.ssh/authorized_keys ~/.ssh/authorized_keys.temp && sed '/^.*#{contents}.*$/d' ~/.ssh/authorized_keys.temp > ~/.ssh/authorized_keys && rm ~/.ssh/authorized_keys.temp")
             end
           end
         end

data/plugins/hosts/arch/host.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
   module HostArch
     class Host < Vagrant.plugin("2", :host)
       def detect?(env)
-        File.exist?("/etc/arch-release")
+        File.exist?("/etc/arch-release") && !File.exist?("/etc/artix-release")
       end
     end
   end

data/plugins/hosts/gentoo/host.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
   module HostGentoo
     class Host < Vagrant.plugin("2", :host)
       def detect?(env)
-        File.exists?("/etc/gentoo-release")
+        File.exist?("/etc/gentoo-release")
       end
     end
   end

data/plugins/hosts/slackware/host.rb

@@ -4,7 +4,7 @@ module VagrantPlugins
   module HostSlackware
     class Host < Vagrant.plugin("2", :host)
       def detect?(env)
-        return File.exists?("/etc/slackware-version") ||
+        return File.exist?("/etc/slackware-version") ||
           !Dir.glob("/usr/lib/setup/Plamo-*").empty?
       end
     end

data/plugins/kernel_v2/config/vm.rb

@@ -10,15 +10,6 @@ require "vagrant/util/presence"
 require "vagrant/util/experimental"
 require "vagrant/util/map_command_options"
 
-$LOAD_PATH << Vagrant.source_root.join("lib/vagrant/protobufs/proto").to_s
-
-require "vagrant/protobufs/proto/protostructure_pb"
-require "vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_pb"
-require "vagrant/protobufs/proto/vagrant_plugin_sdk/plugin_services_pb"
-
-# Include mappers
-require Vagrant.source_root.join("plugins/commands/serve/command").to_s
-
 require File.expand_path("../vm_provisioner", __FILE__)
 require File.expand_path("../vm_subvm", __FILE__)
 require File.expand_path("../disk", __FILE__)

data/plugins/providers/docker/action.rb

@@ -231,6 +231,7 @@ module VagrantPlugins
             b2.use HostMachineSyncFolders
             b2.use PrepareNFSValidIds
             b2.use SyncedFolderCleanup
+            b2.use SyncedFolders
             b2.use PrepareNFSSettings
             b2.use PrepareNetworks
             b2.use Login
@@ -248,7 +249,6 @@ module VagrantPlugins
                   b3.use ForwardedPorts # This action converts the `ports` param into proper network configs
                   b3.use PrepareForwardedPortCollisionParams
                   b3.use HandleForwardedPortCollisions
-                  b3.use SyncedFolders
                   b3.use Pull
                   b3.use Create
                   b3.use WaitForRunning
@@ -268,7 +268,6 @@ module VagrantPlugins
               end
             else
               # We're in a run command, so we do things a bit differently.
-              b2.use SyncedFolders
               b2.use Create
             end
           end

data/plugins/providers/docker/driver.rb

@@ -140,6 +140,9 @@ module VagrantPlugins
         all_containers.each do |c|
           container_info = inspect_container(c)
 
+          active = container_info["State"]["Running"]
+          next unless active # Ignore used ports on inactive containers
+
           if container_info["HostConfig"]["PortBindings"]
             port_bindings = container_info["HostConfig"]["PortBindings"]
             next if port_bindings.empty? # Nothing defined, but not nil either
@@ -233,9 +236,22 @@ module VagrantPlugins
         execute('docker', 'ps', '-a', '-q', '--no-trunc').to_s.split
       end
 
+      # Attempts to first use the docker-cli tool to inspect the default bridge subnet
+      # Falls back to using /sbin/ip if that fails
+      #
       # @return [String] IP address of the docker bridge
       def docker_bridge_ip
-        output = execute('/sbin/ip', '-4', 'addr', 'show', 'scope', 'global', 'docker0')
+        bridge = inspect_network("bridge")&.first
+        if bridge 
+          bridge_ip = bridge.dig("IPAM", "Config", 0, "Gateway")
+        end
+        return bridge_ip if bridge_ip
+        @logger.debug("Failed to get bridge ip from docker, falling back to `ip`")
+        docker_bridge_ip_fallback
+      end
+
+      def docker_bridge_ip_fallback
+        output = execute('ip', '-4', 'addr', 'show', 'scope', 'global', 'docker0')
         if output =~ /^\s+inet ([0-9.]+)\/[0-9]+\s+/
           return $1.to_s
         else

data/plugins/providers/hyperv/driver.rb

@@ -1,4 +1,5 @@
 require "json"
+require "log4r"
 
 require "vagrant/util/powershell"
 
@@ -26,6 +27,7 @@ module VagrantPlugins
 
       def initialize(id)
         @vm_id = id
+        @logger = Log4r::Logger.new("vagrant::hyperv::driver")
       end
 
       # @return [Boolean] Supports VMCX
@@ -294,7 +296,10 @@ module VagrantPlugins
       # @param [String] enhanced session transport type of the VM
       # @return [nil]
       def set_enhanced_session_transport_type(transport_type)
-        execute(:set_enhanced_session_transport_type, VmID: vm_id, type: transport_type)
+        result = execute(:set_enhanced_session_transport_type, VmID: vm_id, type: transport_type)
+        if !result.nil?
+          @logger.debug("EnhancedSessionTransportType is not supported by this version of hyperv, ignoring")
+        end
       end
 
       protected

data/plugins/providers/hyperv/scripts/set_enhanced_session_transport_type.ps1

@@ -17,8 +17,17 @@ try {
 }
 
 try {
-    Hyper-V\Set-VM -VM $VM -EnhancedSessionTransportType $Type
+    # HyperV 1.1 (Windows Server 2012R2) crashes on this call. Vagrantfiles before 2.2.10 do break without skipping this.
+    $present = Get-Command Hyper-V\Set-VM -ParameterName EnhancedSessionTransportType -ErrorAction SilentlyContinue
+    if($present) {
+        Hyper-V\Set-VM -VM $VM -EnhancedSessionTransportType $Type
+    }else{
+        $message = @{
+            "EnhancedSessionTransportTypeSupportPresent"=$false;
+            } | ConvertTo-Json
+        Write-OutputMessage $message
+    }
 } catch {
-    Write-ErrorMessage "Failed to assign EnhancedSessionTransportType to ${Type}: ${PSItem}"
+    Write-ErrorMessage "Failed to assign EnhancedSessionTransportType to ${Type}:${PSItem}"
     exit 1
 }

data/plugins/providers/hyperv/scripts/utils/VagrantVM/VagrantVM.psm1

@@ -1,6 +1,21 @@
 # Always stop when errors are encountered unless instructed not to
 $ErrorActionPreference = "Stop"
 
+# Check the version of Powershell currently in use. If it's
+# under 7.3.0 we need to restrict the maximum version of the
+# security module to prevent errors.
+# Source: https://github.com/PowerShell/PowerShell/issues/18530
+$checkVersion = $PSVersionTable.PSVersion
+if($checkVersion -eq "") {
+    $checkVersion = $(Get-Host).Version
+}
+
+if([System.Version]$checkVersion -lt [System.Version]"7.3.0") {
+    Import-Module Microsoft.Powershell.Security -MaximumVersion 3.0.0.0
+} else {
+    Import-Module Microsoft.Powershell.Security
+}
+
 # Vagrant VM creation functions
 
 function New-VagrantVM {

data/plugins/providers/virtualbox/action/check_virtualbox.rb

@@ -16,12 +16,6 @@ module VagrantPlugins
           # which will break us out of execution of the middleware sequence.
           Driver::Meta.new.verify!
 
-          if Vagrant::Util::Platform.windows? && Vagrant::Util::Platform.windows_hyperv_enabled?
-            @logger.error("Virtualbox and Hyper-V cannot be used together at the same time on Windows and will result in a system crash.")
-
-            raise Vagrant::Errors::HypervVirtualBoxError
-          end
-
           # Carry on.
           @app.call(env)
         end

data/plugins/providers/virtualbox/action/network.rb

@@ -21,6 +21,8 @@ module VagrantPlugins
         VBOX_NET_CONF = "/etc/vbox/networks.conf".freeze
         # Version of VirtualBox that introduced hostonly network range restrictions
         HOSTONLY_VALIDATE_VERSION = Gem::Version.new("6.1.28")
+        # Version of VirtualBox on darwin platform that ignores restrictions
+        DARWIN_IGNORE_HOSTONLY_VALIDATE_VERSION = Gem::Version.new("7.0.0")
         # Default valid range for hostonly networks
         HOSTONLY_DEFAULT_RANGE = [IPAddr.new("192.168.56.0/21").freeze].freeze
 
@@ -69,6 +71,21 @@ module VagrantPlugins
               type = :internal_network
             end
 
+            if !options.key?(:type) && options.key?(:ip)
+              begin
+                addr = IPAddr.new(options[:ip])
+                options[:type] = if addr.ipv4?
+                                   :static
+                                 else
+                                   :static6
+                                 end
+              rescue IPAddr::Error => err
+                raise Vagrant::Errors::NetworkAddressInvalid,
+                      address: options[:ip], mask: options[:netmask],
+                      error: err.message
+              end
+            end
+
             # Configure it
             data = nil
             if type == :private_network
@@ -479,10 +496,7 @@ module VagrantPlugins
         #-----------------------------------------------------------------
         # This creates a host only network for the given configuration.
         def hostonly_create_network(config)
-          @env[:machine].provider.driver.create_host_only_network(
-            adapter_ip: config[:adapter_ip],
-            netmask:    config[:netmask]
-          )
+          @env[:machine].provider.driver.create_host_only_network(config)
         end
 
         # This finds a matching host only network for the given configuration.
@@ -517,7 +531,11 @@ module VagrantPlugins
         # placed on the valid ranges
         def validate_hostonly_ip!(ip, driver)
           return if Gem::Version.new(driver.version) < HOSTONLY_VALIDATE_VERSION ||
-            Vagrant::Util::Platform.windows?
+                    (
+                      Vagrant::Util::Platform.darwin? &&
+                      Gem::Version.new(driver.version) >= DARWIN_IGNORE_HOSTONLY_VALIDATE_VERSION
+                    ) ||
+                    Vagrant::Util::Platform.windows?
 
           ip = IPAddr.new(ip.to_s) if !ip.is_a?(IPAddr)
           valid_ranges = load_net_conf

data/plugins/providers/virtualbox/driver/base.rb

@@ -460,7 +460,9 @@ module VagrantPlugins
           end
 
           # Append in the options for subprocess
-          command << { notify: [:stdout, :stderr] }
+          # NOTE: We include the LANG env var set to C to prevent command output
+          #       from being localized
+          command << { notify: [:stdout, :stderr], env: env_lang}
 
           Vagrant::Util::Busy.busy(int_callback) do
             Vagrant::Util::Subprocess.execute(@vboxmanage_path, *command, &block)
@@ -469,6 +471,52 @@ module VagrantPlugins
           raise Vagrant::Errors::VBoxManageLaunchError,
             message: e.to_s
         end
+
+        private
+
+        # List of LANG values to attempt to use
+        LANG_VARIATIONS = %w(C.UTF-8 C.utf8 en_US.UTF-8 en_US.utf8 C POSIX).map(&:freeze).freeze
+
+        # By default set the LANG to C. If the host has the locale command
+        # available, check installed locales and verify C is included (or
+        # use C variant if available).
+        def env_lang
+          # If already set, just return immediately
+          return @env_lang if @env_lang
+
+          # Default the LANG to C
+          @env_lang = {LANG: "C"}
+
+          # If the locale command is not available, return default
+          return @env_lang if !Vagrant::Util::Which.which("locale")
+
+          @logger.debug("validating LANG value for virtualbox cli commands")
+          # Get list of available locales on the system
+          result = Vagrant::Util::Subprocess.execute("locale", "-a")
+
+          # If the command results in an error, just log the error
+          # and return the default value
+          if result.exit_code != 0
+            @logger.warn("locale command failed (exit code: #{result.exit_code}): #{result.stderr}")
+            return @env_lang
+          end
+          available = result.stdout.lines.map(&:chomp).find_all { |l|
+            l == "C" || l == "POSIX" || l.start_with?("C.") || l.start_with?("en_US.")
+          }
+          @logger.debug("list of available C locales: #{available.inspect}")
+
+          # Attempt to find a valid LANG from locale list
+          lang = LANG_VARIATIONS.detect { |l| available.include?(l) }
+
+          if lang
+            @logger.debug("valid variation found for LANG value: #{lang}")
+            @env_lang[:LANG] = lang
+          end
+
+          @logger.debug("LANG value set: #{@env_lang[:LANG].inspect}")
+
+          @env_lang
+        end
       end
     end
   end

data/plugins/providers/virtualbox/driver/version_5_0.rb

@@ -104,15 +104,15 @@ module VagrantPlugins
           end
         end
 
-       # Creates a disk. Default format is VDI unless overridden
-       #
-       # @param [String] disk_file
-       # @param [Integer] disk_size - size in bytes
-       # @param [String] disk_format - format of disk, defaults to "VDI"
+        # Creates a disk. Default format is VDI unless overridden
+        #
+        # @param [String] disk_file
+        # @param [Integer] disk_size - size in bytes
+        # @param [String] disk_format - format of disk, defaults to "VDI"
         # @param [Hash]  opts -  additional options
-       def create_disk(disk_file, disk_size, disk_format="VDI", **opts)
-         execute("createmedium", '--filename', disk_file, '--sizebyte', disk_size.to_i.to_s, '--format', disk_format)
-       end
+        def create_disk(disk_file, disk_size, disk_format="VDI", **opts)
+          execute("createmedium", '--filename', disk_file, '--sizebyte', disk_size.to_i.to_s, '--format', disk_format)
+        end
 
 
         def create_host_only_network(options)
@@ -322,22 +322,22 @@ module VagrantPlugins
 
             if adapter[:bridge]
               args.concat(["--bridgeadapter#{adapter[:adapter]}",
-                          adapter[:bridge], "--cableconnected#{adapter[:adapter]}", "on"])
+                           adapter[:bridge], "--cableconnected#{adapter[:adapter]}", "on"])
             end
 
             if adapter[:hostonly]
               args.concat(["--hostonlyadapter#{adapter[:adapter]}",
-                          adapter[:hostonly], "--cableconnected#{adapter[:adapter]}", "on"])
+                           adapter[:hostonly], "--cableconnected#{adapter[:adapter]}", "on"])
             end
 
             if adapter[:intnet]
               args.concat(["--intnet#{adapter[:adapter]}",
-                          adapter[:intnet], "--cableconnected#{adapter[:adapter]}", "on"])
+                           adapter[:intnet], "--cableconnected#{adapter[:adapter]}", "on"])
             end
 
             if adapter[:mac_address]
               args.concat(["--macaddress#{adapter[:adapter]}",
-                          adapter[:mac_address]])
+                           adapter[:mac_address]])
             end
 
             if adapter[:nic_type]
@@ -361,7 +361,7 @@ module VagrantPlugins
 
               # If the file already exists we'll throw a custom error
               raise Vagrant::Errors::VirtualBoxFileExists,
-                stderr: e.extra_data[:stderr]
+                    stderr: e.extra_data[:stderr]
             end
           end
         end
@@ -370,14 +370,14 @@ module VagrantPlugins
           args = []
           ports.each do |options|
             pf_builder = [options[:name],
-              options[:protocol] || "tcp",
-              options[:hostip] || "",
-              options[:hostport],
-              options[:guestip] || "",
-              options[:guestport]]
+                          options[:protocol] || "tcp",
+                          options[:hostip] || "",
+                          options[:hostport],
+                          options[:guestip] || "",
+                          options[:guestport]]
 
             args.concat(["--natpf#{options[:adapter] || 1}",
-                        pf_builder.join(",")])
+                         pf_builder.join(",")])
           end
 
           execute("modifyvm", @uuid, *args, retryable: true) if !args.empty?
@@ -507,11 +507,11 @@ module VagrantPlugins
             # since this comes first.
             current_nic = $1.to_i if line =~ /^nic(\d+)=".+?"$/
 
-              # If we care about active VMs only, then we check the state
-              # to verify the VM is running.
-              if active_only && line =~ /^VMState="(.+?)"$/ && $1.to_s != "running"
-                return []
-              end
+            # If we care about active VMs only, then we check the state
+            # to verify the VM is running.
+            if active_only && line =~ /^VMState="(.+?)"$/ && $1.to_s != "running"
+              return []
+            end
 
             # Parse out the forwarded port information
             # Forwarding(1)="172.22.8.201tcp32977,tcp,172.22.8.201,32977,,3777"
@@ -600,7 +600,7 @@ module VagrantPlugins
 
           if !valid_ip_address?(ip)
             raise Vagrant::Errors::VirtualBoxGuestPropertyNotFound,
-              guest_property: "/VirtualBox/GuestInfo/Net/#{adapter_number}/V4/IP"
+                  guest_property: "/VirtualBox/GuestInfo/Net/#{adapter_number}/V4/IP"
           end
 
           return ip
@@ -662,13 +662,17 @@ module VagrantPlugins
         end
 
         def read_machine_folder
-          execute("list", "systemproperties", retryable: true).split("\n").each do |line|
-            if line =~ /^Default machine folder:\s+(.+?)$/i
-              return $1.to_s
-            end
+          info = execute("list", "systemproperties", retryable: true)
+          info.each_line do |line|
+            match = line.match(/Default machine folder:\s+(?<folder>.+?)$/i)
+            next if match.nil?
+            return match[:folder]
           end
 
-          nil
+          @logger.warn("failed to determine machine folder from system properties")
+          @logger.debug("processed output for machine folder lookup:\n#{info}")
+
+          raise Vagrant::Errors::VirtualBoxMachineFolderNotFound
         end
 
         def read_network_interfaces
@@ -771,7 +775,7 @@ module VagrantPlugins
               # We got VERR_ALREADY_EXISTS. This means that we're renaming to
               # a VM name that already exists. Raise a custom error.
               raise Vagrant::Errors::VirtualBoxNameExists,
-                stderr: e.extra_data[:stderr]
+                    stderr: e.extra_data[:stderr]
             end
           end
         end
@@ -791,9 +795,9 @@ module VagrantPlugins
               hostpath = Vagrant::Util::Platform.windows_path(folder[:hostpath])
             end
             args = ["--name",
-              folder[:name],
-              "--hostpath",
-              hostpath]
+                    folder[:name],
+                    "--hostpath",
+                    hostpath]
             args << "--transient" if folder.key?(:transient) && folder[:transient]
 
             args << "--automount" if folder.key?(:automount) && folder[:automount]
@@ -866,8 +870,8 @@ module VagrantPlugins
 
             # If we reached this point then it didn't work out.
             raise Vagrant::Errors::VBoxManageError,
-              command: command.inspect,
-              stderr: r.stderr
+                  command: command.inspect,
+                  stderr: r.stderr
           end
         end