vagrant-unbundled 2.3.3.0 → 2.3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d80f12bb6896767fb93de74dca7ff025aeb935c32bf6a2ab202b30582329ea1
-  data.tar.gz: ff5d56384a90926d3393a85400f3b34579f1e901b348318ae71b0219b8a29049
+  metadata.gz: 56801a2f5c2faf956d305ef49f1513549a059133c9131e3a588d7c985e725d6d
+  data.tar.gz: f10390220e89207bd05dd07deef7c004d745338c985c8058d9faa34ed9cedc6f
 SHA512:
-  metadata.gz: c84b9f9edc34fcecd13ca1b740903d1074242e0797cef80d849055959ea95da61b77eb07fe86ba5e53cf3db23aeddec02d91459972101fc2bd18efa026a690e6
-  data.tar.gz: 3cf8aebc8ff49c47dc52c47bf4ef329ed7fd3e2109c72aacbc06d751aafbecdb2e10be61f2405015683031bb5a9ca9bbf639d8b0c08809078eb72a9a1f060fcc
+  metadata.gz: b443c030b4db01b126dc84ac6478db69418c09177a41103683eb08a097b85c5346497bc3d3c4887a6a1c0c1b068194587a18a4c19c18d4e51b3393790dee45a3
+  data.tar.gz: 5dc9803a4af2fc545dc209382d8194651455ed300bcec8621f9672d69d36b9ed27ae9b97a0017afeb2991e65c784e3363ca8215de7e5479d497907d9ef143c8f

data/.gitignore

@@ -70,3 +70,6 @@ __debug_bin
 # solargraph (ruby lsp) & rubocop
 .solargraph.yml
 .rubocop.yml
+
+# Ignore generated binaries
+bin/vagrant-go*

data/CHANGELOG.md

@@ -1,3 +1,45 @@
+## 2.3.6 (May 19, 2023)
+
+BUG FIXES:
+
+- command/serve: Isolate proto constants to file for auto-loading [GH-13165]
+- core/util: Unlock file prior to deletion [GH-13159]
+- provider/docker: Attempt using docker command for bridge ip [GH-13153]
+- provider/virtualbox: Update preferred locale values for driver [GH-13160]
+
+## 2.3.5 (May 15, 2023)
+
+BUG FIXES:
+
+- communicator/ssh: Use netssh builtin keep alive functionality [GH-13069]
+- communicator/ssh: Update connection settings when using a password to connect ssh [GH-13052]
+- core:  Add a file mutex when downloading box files [GH-13057]
+- guest/arch: Support differentiating between Artix and Arch Linux [GH-13055]
+- host/windows: Get state of Windows feature "Microsoft-Hyper-V-Hypervisor" [GH-11933]
+- provider/docker: Ignore inactive docker containers when assigning ports [GH-13146]
+- provider/docker: Sync folders before preparing nfs settings [GH-13149]
+- provider/virtualbox: De-duplicate machine port forward info [GH-13056]
+- provider/virtualbox:  Remove check for hyperv being enabled when verifying virtualbox is usable on windows [GH-13090]
+- provider/virtualbox: Validate LANG value when possible [GH-13150]
+- provider/hyperv: Check for hyper-v feature "EnhancedSessionTransportType" [GH-12280]
+- provisioner/ansible: Fix installing Ansible provisioner with version and pip [GH-13054]
+- synced_folders/rsync: allow rsync-auto to also ignore relative paths [GH-13066]
+
+NOTE: Vagrant installer packages were updated to Ruby 3
+
+## 2.3.4 (December 9, 2022)
+
+IMPROVEMENTS:
+
+- host/darwin: Isolate loading incompatible libraries to support EOL platforms [GH-13022]
+- provider/virtualbox: Detect network type when not provided [GH-13024]
+
+BUG FIXES:
+
+- host/windows: Add fix for Powershell 7.3.0 [GH-13006]
+- provider/virtualbox: Adjust hostnet DHCP configuration, ignore invalid devices [GH-13004]
+- provisioner/ansible: Fix install package names on older debian (and derivatives) versions [GH-13017]
+
 ## 2.3.3 (November 15, 2022) 
 
 IMPROVEMENTS:

data/Gemfile.lock

@@ -12,7 +12,7 @@ GIT
 PATH
   remote: .
   specs:
-    vagrant-unbundled (2.3.3.0)
+    vagrant-unbundled (2.3.6.0)
       bcrypt_pbkdf (~> 1.1)
       childprocess (~> 4.1.0)
       ed25519 (~> 1.3.0)
@@ -20,24 +20,24 @@ PATH
       googleapis-common-protos-types (~> 1.3)
       grpc
       hashicorp-checkpoint (~> 0.1.5)
-      i18n (~> 1.8)
+      i18n (~> 1.12)
       ipaddr (>= 1.2.4)
-      listen (~> 3.6)
+      listen (~> 3.7)
       log4r (~> 1.1.9, < 1.1.11)
       mime-types (~> 3.3)
-      net-ftp (~> 0.1)
+      net-ftp (~> 0.2)
       net-scp (~> 4.0)
       net-sftp (~> 4.0)
       net-ssh (~> 7.0)
       rb-kqueue (~> 0.2.0)
       rexml (~> 3.2)
-      rgl (~> 0.5.7)
-      rubyzip (~> 2.0)
+      rgl (~> 0.5.10)
+      rubyzip (~> 2.3.2)
       vagrant_cloud (~> 3.0.5)
-      wdm (~> 0.1.0)
-      winrm (>= 2.3.4, < 3.0)
-      winrm-elevated (>= 1.2.1, < 2.0)
-      winrm-fs (>= 1.3.4, < 2.0)
+      wdm (~> 0.1.1)
+      winrm (>= 2.3.6, < 3.0)
+      winrm-elevated (>= 1.2.3, < 2.0)
+      winrm-fs (>= 1.3.5, < 2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -45,19 +45,19 @@ GEM
     bcrypt_pbkdf (1.1.0)
     builder (3.2.4)
     childprocess (4.1.0)
-    concurrent-ruby (1.1.10)
-    date (3.2.2)
+    concurrent-ruby (1.2.2)
+    date (3.3.3)
     diff-lcs (1.5.0)
     ed25519 (1.3.0)
-    erubi (1.11.0)
-    excon (0.94.0)
+    erubi (1.12.0)
+    excon (0.104.0)
     fake_ftp (0.3.0)
-    ffi (1.15.5)
-    google-protobuf (3.21.9)
-    googleapis-common-protos-types (1.4.0)
-      google-protobuf (~> 3.14)
-    grpc (1.50.0)
-      google-protobuf (~> 3.21)
+    ffi (1.16.3)
+    google-protobuf (3.24.4)
+    googleapis-common-protos-types (1.9.0)
+      google-protobuf (~> 3.18)
+    grpc (1.58.0)
+      google-protobuf (~> 3.23)
       googleapis-common-protos-types (~> 1.0)
     grpc-tools (1.50.0)
     gssapi (1.3.1)
@@ -67,10 +67,10 @@ GEM
       rexml (~> 3.0)
     hashicorp-checkpoint (0.1.5)
     httpclient (2.8.3)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    ipaddr (1.2.4)
-    listen (3.7.1)
+    ipaddr (1.2.5)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     little-plugger (1.1.4)
@@ -78,30 +78,30 @@ GEM
     logging (2.3.1)
       little-plugger (~> 1.1)
       multi_json (~> 1.14)
-    mime-types (3.4.1)
+    mime-types (3.5.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
+    mime-types-data (3.2023.1003)
     multi_json (1.15.0)
     net-ftp (0.2.0)
       net-protocol
       time
-    net-protocol (0.1.3)
+    net-protocol (0.2.1)
       timeout
     net-scp (4.0.0)
       net-ssh (>= 2.6.5, < 8.0.0)
     net-sftp (4.0.0)
       net-ssh (>= 5.0.0, < 8.0.0)
-    net-ssh (7.0.1)
+    net-ssh (7.2.0)
     nori (2.6.0)
-    pairing_heap (1.0.0)
+    pairing_heap (3.0.1)
     rake (13.0.6)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rb-kqueue (0.2.8)
       ffi (>= 0.5.0)
-    rexml (3.2.5)
-    rgl (0.5.9)
+    rexml (3.2.6)
+    rgl (0.5.10)
       pairing_heap (>= 0.3.0)
       rexml (~> 3.2, >= 3.2.4)
       stream (~> 0.5.3)
@@ -125,9 +125,9 @@ GEM
     rubyzip (2.3.2)
     stream (0.5.5)
     thor (0.18.1)
-    time (0.2.0)
+    time (0.2.2)
       date
-    timeout (0.3.0)
+    timeout (0.4.0)
     vagrant_cloud (3.0.5)
       excon (~> 0.73)
       log4r (~> 1.1.10)

data/Makefile

@@ -10,31 +10,75 @@ CGO_ENABLED?=0
 .PHONY: bin
 bin: # bin creates the binaries for Vagrant for the current platform
 	@test -s "thirdparty/proto/api-common-protos/.git" || { echo "git submodules not initialized, run 'git submodule update --init --recursive' and try again"; exit 1; }
-	CGO_ENABLED=$(CGO_ENABLED) go build -ldflags $(GOLDFLAGS) -gcflags="$(GCFLAGS)" -tags assetsembedded -o ./vagrant ./cmd/vagrant
+	CGO_ENABLED=$(CGO_ENABLED) go build -ldflags $(GOLDFLAGS) -gcflags="$(GCFLAGS)" -tags assetsembedded -o ./bin/vagrant-go ./cmd/vagrant
 
 .PHONY: debug
 debug: # debug creates an executable with optimizations off, suitable for debugger attachment
 	GCFLAGS="all=-N -l" $(MAKE) bin
 
+.PHONY: all
+all:
+	$(MAKE) bin/windows
+	$(MAKE) bin/linux
+	$(MAKE) bin/darwin
+
 .PHONY: bin/windows
-bin/windows: # create windows binaries
-	@test -s "thirdparty/proto/api-common-protos/.git" || { echo "git submodules not initialized, run 'git submodule update --init --recursive' and try again"; exit 1; }#
-	GOOS=windows GOARCH=amd64 CGO_ENABLED=$(CGO_ENABLED) go build -ldflags $(GOLDFLAGS) -tags assetsembedded -o ./vagrant.exe ./cmd/vagrant
+bin/windows:
+	$(MAKE) bin/windows-amd64
+	$(MAKE) bin/windows-386
+
+.PHONY: bin/windows-amd64
+bin/windows-amd64: # create windows binaries
+	@test -s "thirdparty/proto/api-common-protos/.git" || { echo "git submodules not initialized, run 'git submodule update --init --recursive' and try again"; exit 1; }
+	GOOS=windows GOARCH=amd64 CGO_ENABLED=$(CGO_ENABLED) go build -ldflags $(GOLDFLAGS) -tags assetsembedded -o ./bin/vagrant-go_windows_amd64.exe ./cmd/vagrant
+
+.PHONY: bin/windows-386
+bin/windows-386: # create windows binaries
+	@test -s "thirdparty/proto/api-common-protos/.git" || { echo "git submodules not initialized, run 'git submodule update --init --recursive' and try again"; exit 1; }
+	GOOS=windows GOARCH=386 CGO_ENABLED=$(CGO_ENABLED) go build -ldflags $(GOLDFLAGS) -tags assetsembedded -o ./bin/vagrant-go_windows_386.exe ./cmd/vagrant
 
 .PHONY: bin/linux
-bin/linux: # create Linux binaries
+bin/linux:
+	$(MAKE) bin/linux-amd64
+	$(MAKE) bin/linux-386
+
+.PHONY: bin/linux-amd64
+bin/linux-amd64: # create Linux binaries
 	@test -s "thirdparty/proto/api-common-protos/.git" || { echo "git submodules not initialized, run 'git submodule update --init --recursive' and try again"; exit 1; }
-	GOOS=linux GOARCH=amd64 $(MAKE) bin
+	GOOS=linux GOARCH=amd64 CGO_ENABLED=$(CGO_ENABLED) go build -ldflags $(GOLDFLAGS) -gcflags="$(GCFLAGS)" -tags assetsembedded -o ./bin/vagrant-go_linux_amd64 ./cmd/vagrant
 
 .PHONY: bin/linux-386
 bin/linux-386: # create Linux binaries
 	@test -s "thirdparty/proto/api-common-protos/.git" || { echo "git submodules not initialized, run 'git submodule update --init --recursive' and try again"; exit 1; }
-	GOOS=linux GOARCH=386 $(MAKE) bin
+	GOOS=linux GOARCH=386 CGO_ENABLED=$(CGO_ENABLED) go build -ldflags $(GOLDFLAGS) -gcflags="$(GCFLAGS)" -tags assetsembedded -o ./bin/vagrant-go_linux_386 ./cmd/vagrant
 
 .PHONY: bin/darwin
-bin/darwin: # create Darwin binaries
+bin/darwin:
+	$(MAKE) bin/darwin-amd64
+	$(MAKE) bin/darwin-arm64
+	$(MAKE) bin/darwin-universal
+
+.PHONY: bin/darwin-amd64
+bin/darwin-amd64: # create Darwin binaries
+	@test -s "thirdparty/proto/api-common-protos/.git" || { echo "git submodules not initialized, run 'git submodule update --init --recursive' and try again"; exit 1; }
+	GOOS=darwin GOARCH=amd64 CGO_ENABLED=$(CGO_ENABLED) go build -ldflags $(GOLDFLAGS) -gcflags="$(GCFLAGS)" -tags assetsembedded -o ./bin/vagrant-go_darwin_amd64 ./cmd/vagrant
+
+.PHONY: bin/darwin-arm64
+bin/darwin-arm64: # create Darwin binaries
 	@test -s "thirdparty/proto/api-common-protos/.git" || { echo "git submodules not initialized, run 'git submodule update --init --recursive' and try again"; exit 1; }
-	GOOS=darwin GOARCH=amd64 $(MAKE) bin
+	GOOS=darwin GOARCH=arm64 CGO_ENABLED=$(CGO_ENABLED) go build -ldflags $(GOLDFLAGS) -gcflags="$(GCFLAGS)" -tags assetsembedded -o ./bin/vagrant-go_darwin_arm64 ./cmd/vagrant
+
+.PHONY: bin/darwin-universal
+bin/darwin-universal:
+	@test -s "thirdparty/proto/api-common-protos/.git" || { echo "git submodules not initialized, run 'git submodule update --init --recursive' and try again"; exit 1; }
+	GOOS=darwin GOARCH=arm64 CGO_ENABLED=$(CGO_ENABLED) go build -ldflags $(GOLDFLAGS) -gcflags="$(GCFLAGS)" -tags assetsembedded -o ./bin/.vagrant-go_darwin_arm64 ./cmd/vagrant
+	GOOS=darwin GOARCH=amd64 CGO_ENABLED=$(CGO_ENABLED) go build -ldflags $(GOLDFLAGS) -gcflags="$(GCFLAGS)" -tags assetsembedded -o ./bin/.vagrant-go_darwin_amd64 ./cmd/vagrant
+	go run github.com/randall77/makefat ./bin/vagrant-go_darwin_universal ./bin/.vagrant-go_darwin_arm64 ./bin/.vagrant-go_darwin_amd64
+	rm -f ./bin/.vagrant-go_darwin*
+
+.PHONY: clean
+clean:
+	rm -f ./bin/vagrant-go* ./bin/.vagrant-go_darwin*
 
 .PHONY: test
 test: # run tests

data/contrib/bash/completion.sh

@@ -153,6 +153,21 @@ _vagrant() {
               COMPREPLY=($(compgen -W "${box_list}" -- ${cur}))
               return 0
               ;;
+            "add")
+              local add_commands="\
+                --name \
+                --checksum \
+                --checksum-type \
+                -c --clean \
+                -f --force \
+                "
+              if [[ $cur == -* ]]; then
+                COMPREPLY=($(compgen -W "${add_commands}" -- ${cur}))
+              else
+                COMPREPLY=($(compgen -o default -- "${cur}"))
+              fi
+              return 0
+              ;;
             *)
               ;;
           esac

data/go.mod

@@ -43,6 +43,7 @@ require (
 	github.com/oklog/ulid/v2 v2.0.2
 	github.com/pkg/errors v0.9.1
 	github.com/posener/complete v1.2.3
+	github.com/randall77/makefat v0.0.0-20210315173500-7ddd0e42c844
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
 	github.com/stretchr/testify v1.7.5
 	github.com/zclconf/go-cty v1.10.0
@@ -94,7 +95,6 @@ require (
 	github.com/go-git/gcfg v1.5.0 // indirect
 	github.com/go-git/go-billy/v5 v5.0.0 // indirect
 	github.com/go-test/deep v1.0.7 // indirect
-	github.com/gogo/googleapis v1.4.1 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect

data/go.sum

@@ -209,8 +209,6 @@ github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M=
 github.com/go-test/deep v1.0.7/go.mod h1:QV8Hv/iy04NyLBxAdO9njL0iVPN1S4d/A3NVv1V36o8=
 github.com/gofrs/flock v0.8.0 h1:MSdYClljsF3PbENUUEx85nkWfJSGfzYI9yEBZOJz6CY=
 github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
-github.com/gogo/googleapis v1.4.1 h1:1Yx4Myt7BxzvUr5ldGSbwYiZG6t9wGBZ+8/fX3Wvtq0=
-github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4=
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
@@ -361,14 +359,6 @@ github.com/hashicorp/hcl/v2 v2.11.1 h1:yTyWcXcm9XB0TEkyU/JCRU6rYy4K+mgLtzn2wlrJb
 github.com/hashicorp/hcl/v2 v2.11.1/go.mod h1:FwWsfWEjyV/CMj8s/gqAuiviY72rJ1/oayI9WftqcKg=
 github.com/hashicorp/nomad/api v0.0.0-20200814140818-42de70466a9d h1:afuZ/KNbxwUgjEzq2NXO2bRKZgsIJQgFxgIRGETF0/A=
 github.com/hashicorp/nomad/api v0.0.0-20200814140818-42de70466a9d/go.mod h1:DCi2k47yuUDzf2qWAK8E1RVmWgz/lc0jZQeEnICTxmY=
-github.com/hashicorp/vagrant-plugin-sdk v0.0.0-20220913204040-793a2626f6f9 h1:wfdFsM/smge6K+RDgGLxWF4TcmAXZJis/IVUyT+G3JQ=
-github.com/hashicorp/vagrant-plugin-sdk v0.0.0-20220913204040-793a2626f6f9/go.mod h1:zA5vDskG3gH306C+obL+yURiUiLMAlx52yqO8MC2r9w=
-github.com/hashicorp/vagrant-plugin-sdk v0.0.0-20220919180525-50c632cd450d h1:TqCLroDhxzGMXE7LrgqDayOku2oRJ4vjROX7ghpzqsI=
-github.com/hashicorp/vagrant-plugin-sdk v0.0.0-20220919180525-50c632cd450d/go.mod h1:zA5vDskG3gH306C+obL+yURiUiLMAlx52yqO8MC2r9w=
-github.com/hashicorp/vagrant-plugin-sdk v0.0.0-20220919180735-d47bfe003e94 h1:CGq9dOg/kK0ihxx81H59xEHGfTvRs0ls8qCL3Bujdgo=
-github.com/hashicorp/vagrant-plugin-sdk v0.0.0-20220919180735-d47bfe003e94/go.mod h1:zA5vDskG3gH306C+obL+yURiUiLMAlx52yqO8MC2r9w=
-github.com/hashicorp/vagrant-plugin-sdk v0.0.0-20220928204300-c0e4b14e08c5 h1:xxwRPE6ISOz4CFFJlk3DmDD+4ZBt7iO9YiGwk4W/CYY=
-github.com/hashicorp/vagrant-plugin-sdk v0.0.0-20220928204300-c0e4b14e08c5/go.mod h1:zA5vDskG3gH306C+obL+yURiUiLMAlx52yqO8MC2r9w=
 github.com/hashicorp/vagrant-plugin-sdk v0.0.0-20220928204555-798e860a8593 h1:A75xYKrvyA/fNB6nSLBosbcrEmGTZSyMvuFHH7agscY=
 github.com/hashicorp/vagrant-plugin-sdk v0.0.0-20220928204555-798e860a8593/go.mod h1:zA5vDskG3gH306C+obL+yURiUiLMAlx52yqO8MC2r9w=
 github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
@@ -517,6 +507,8 @@ github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndr
 github.com/posener/complete v1.2.3 h1:NP0eAhjcjImqslEwo/1hq7gpajME0fTLTezBKDqfXqo=
 github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/randall77/makefat v0.0.0-20210315173500-7ddd0e42c844 h1:GranzK4hv1/pqTIhMTXt2X8MmMOuH3hMeUR0o9SP5yc=
+github.com/randall77/makefat v0.0.0-20210315173500-7ddd0e42c844/go.mod h1:T1TLSfyWVBRXVGzWd0o9BI4kfoO9InEgfQe4NV3mLz8=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=

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

@@ -6,6 +6,7 @@ require "uri"
 require "vagrant/box_metadata"
 require "vagrant/util/downloader"
 require "vagrant/util/file_checksum"
+require "vagrant/util/file_mutex"
 require "vagrant/util/platform"
 
 module Vagrant
@@ -479,12 +480,21 @@ module Vagrant
           end
 
           begin
-            d.download!
-          rescue Errors::DownloaderInterrupted
-            # The downloader was interrupted, so just return, because that
-            # means we were interrupted as well.
-            @download_interrupted = true
-            env[:ui].info(I18n.t("vagrant.actions.box.download.interrupted"))
+            mutex_path = d.destination + ".lock"
+            Util::FileMutex.new(mutex_path).with_lock do
+              begin
+                d.download!
+              rescue Errors::DownloaderInterrupted
+                # The downloader was interrupted, so just return, because that
+                # means we were interrupted as well.
+                @download_interrupted = true
+                env[:ui].info(I18n.t("vagrant.actions.box.download.interrupted"))
+              end
+            end
+          rescue Errors::VagrantLocked
+            raise Errors::DownloadAlreadyInProgress,
+              dest_path: d.destination,
+              lock_file_path: mutex_path
           end
 
           Pathname.new(d.destination)

data/lib/vagrant/environment.rb

@@ -846,7 +846,7 @@ module Vagrant
         begin
           @logger.info("Creating: #{dir}")
           FileUtils.mkdir_p(dir)
-        rescue Errno::EACCES
+        rescue Errno::EACCES, Errno::EROFS
           raise Errors::HomeDirectoryNotAccessible, home_path: @home_path.to_s
         end
       end

data/lib/vagrant/errors.rb

@@ -376,6 +376,10 @@ module Vagrant
       error_key(:dotfile_upgrade_json_error)
     end
 
+    class DownloadAlreadyInProgress < VagrantError
+      error_key(:download_already_in_progress_error)
+    end
+
     class DownloaderError < VagrantError
       error_key(:downloader_error)
     end
@@ -920,6 +924,10 @@ module Vagrant
       error_key(:uploader_interrupted)
     end
 
+    class VagrantLocked < VagrantError
+      error_key(:vagrant_locked)
+    end
+
     class VagrantInterrupt < VagrantError
       error_key(:interrupted)
     end

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

@@ -15,11 +15,6 @@ module Vagrant
 
         UNSET_VALUE = :__UNSET__VALUE__
 
-        if Vagrant.server_mode?
-          GENERAL_CONFIG_CLS = Hashicorp::Vagrant::Sdk::Vagrantfile::GeneralConfig
-          SYMBOL_PROTO = Hashicorp::Vagrant::Sdk::Args::Symbol
-        end
-
         # This is called as a last-minute hook that allows the configuration
         # object to finalize itself before it will be put into use. This is
         # a useful place to do some defaults in the case the user didn't

data/lib/vagrant/shared_helpers.rb

@@ -235,6 +235,7 @@ module Vagrant
   # @return [true]
   def self.enable_server_mode!
     if !server_mode?
+      load_vagrant_proto!
       SERVER_MODE_CALLBACKS.each(&:call)
       Util::HCLogOutputter.new("hclog")
       Log4r::Outputter["hclog"].formatter = Util::HCLogFormatter.new
@@ -257,6 +258,26 @@ module Vagrant
     @_server_mode = true
   end
 
+  # Load the vagrant proto messages
+  def self.load_vagrant_proto!
+    return if @_vagrant_proto_loaded
+    # Update the load path so our protos can be located
+    $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
+
+    # Load our protos so they are available
+    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'
+    @_vagrant_proto_loaded = true
+  end
+
   SERVER_MODE_CALLBACKS = [
     ->{ Vagrant::Box.prepend(Vagrant::Box::Remote) },
     ->{ Vagrant::BoxCollection.prepend(Vagrant::BoxCollection::Remote) },

data/lib/vagrant/util/file_mutex.rb

@@ -0,0 +1,47 @@
+module Vagrant
+  module Util
+    # Utility to provide a simple mutex via file lock
+    class FileMutex
+      # Create a new FileMutex instance
+      #
+      # @param mutex_path [String] path for file
+      def initialize(mutex_path)
+        @mutex_path = mutex_path
+      end
+
+      # Execute provided block within lock and unlock
+      # when completed
+      def with_lock(&block)
+        lock
+        begin
+          block.call
+        rescue => e
+          raise e
+        ensure
+          unlock
+        end
+      end
+
+      # Attempt to acquire the lock
+      def lock
+        if lock_file.flock(File::LOCK_EX|File::LOCK_NB) === false
+          raise Errors::VagrantLocked, lock_file_path: @mutex_path
+        end
+      end
+
+      # Unlock the file
+      def unlock
+        lock_file.flock(File::LOCK_UN)
+        lock_file.close
+        File.delete(@mutex_path) if File.file?(@mutex_path)
+      end
+
+      protected
+
+      def lock_file
+        return @lock_file if @lock_file && !@lock_file.closed?
+        @lock_file = File.open(@mutex_path, "w+")
+      end
+    end
+  end
+end

data/lib/vagrant/util/platform.rb

@@ -139,14 +139,20 @@ module Vagrant
           return @_windows_hyperv_enabled if defined?(@_windows_hyperv_enabled)
 
           @_windows_hyperv_enabled = -> {
-            ["Get-WindowsOptionalFeature", "Get-WindowsFeature"].each do |cmd_name|
-              ps_cmd = "$(#{cmd_name} -FeatureName Microsoft-Hyper-V-Hypervisor).State"
+            check_commands = Array.new.tap do |c|
+              c << "(Get-WindowsOptionalFeature -FeatureName Microsoft-Hyper-V-Hypervisor -Online).State"
+              c << "(Get-WindowsFeature -FeatureName Microsoft-Hyper-V-Hypervisor).State"
+            end
+            check_commands.each do |ps_cmd|
               begin
                 output = Vagrant::Util::PowerShell.execute_cmd(ps_cmd)
                 return true if output == "Enabled"
               rescue Errors::PowerShellInvalidVersion
                 logger.warn("Invalid PowerShell version detected during Hyper-V enable check")
                 return false
+              rescue Errors::PowerShellError
+                logger.warn("Powershell command not found or error on execution of command")
+                return false
               end
             end
             return false

data/lib/vagrant/util.rb

@@ -20,6 +20,7 @@ module Vagrant
     autoload :Experimental,              'vagrant/util/experimental'
     autoload :FileChecksum,              'vagrant/util/file_checksum'
     autoload :FileMode,                  'vagrant/util/file_mode'
+    autoload :FileMutex,                 'vagrant/util/file_mutex'
     autoload :GuestHosts,                'vagrant/util/guest_hosts'
     autoload :GuestInspection,           'vagrant/util/guest_inspection'
     autoload :HashWithIndifferentAccess, 'vagrant/util/hash_with_indifferent_access'

data/lib/vagrant.rb

@@ -39,6 +39,7 @@ module VagrantPlugins
   OptionParser = Vagrant::OptionParser
 end
 
+# Load in our helpers and utilities
 require "vagrant/shared_helpers"
 require "rubygems"
 require "vagrant/util"

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