vagrant 2.4.5 → 2.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 771bdb811142a04fbad06beadeec9a489d9200fc3649f7611600d189a5bae1cd
-  data.tar.gz: 9539cc14227d6eb0935f7eabd4808a8304b3ae890febad6d5dd15951c3d54663
+  metadata.gz: 0626c2a374eefa0d6beab52f299d0d1ecaf4855ae7f53dc1a29bc4bb3372fb97
+  data.tar.gz: d37e2e061bfed1c565c87838f9810dbea194c73f64c61dc05be1e3da6c73740c
 SHA512:
-  metadata.gz: 961e6ece9c756db4b34d8ac2cad08d13dfacdcb5089506d00274c2b903fe6ded75f22c956ea80a3487ed905e3a2882d1b5b1290b801e8bfdbe7a647aa0df70c1
-  data.tar.gz: 77ac150c7313b57b7abe9541da461dc8642488333baafe48ca2404b080fd5941068159ef5971819b61cf8b907a477ba02a816376cfeea6a424a0dd169472047e
+  metadata.gz: 6c8598105fca1aa04c40df75a460115e94a6baf6731dc5d558e8cc3228e1f2e4894b085f0352f35bf3bcd11b0058007cdf7532044705903850729061fa1a87e7
+  data.tar.gz: b470ce0c8eefd4833999ab0f115ed224fac078b7362428e398b244dfeec73beb2a31371dfc4a2c2b57e52c2c6acad0b421690dd1e0f32da41f2bef59e7307845

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 2.4.6 (May 21, 2025)
+
+IMPROVEMENTS:
+
+- core: Improve error messages on box add failures [GH-13660]
+- core: Only generate and attach ISO for cloud-init on first boot [GH-13666]
+- host/windows: Add basic oscdimg detection on Windows [GH-13668]
+- provider/hyperv: Enable cloud-init support [GH-13671]
+- provider/virtualbox: Allow link-local IPv6 addresses for hostonly [GH-12653]
+
+BUG FIXES:
+
+- command: Remove server mode checks [GH-13657]
+- core: Prevent cloud-init from regenerating and attaching ISO [GH-13666]
+- provider/hyperv: Extract machine ID if collection returned [GH-13669]
+- provider/hyperv: Fix import failure due to lack of resources [GH-13670]
+- provider/virtualbox: Fix VirtualBox private network setup [GH-13659]
+
 ## 2.4.5 (April 23, 2025)
 
 FEATURES:

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

@@ -263,20 +263,64 @@ module Vagrant
             provider: provider,
             architecture: architecture,
           )
+
           if !metadata_version
-            if provider && !metadata.version(">= 0", provider: provider, architecture: architecture)
-              raise Errors::BoxAddNoMatchingProvider,
+            if provider
+              # If no version found that supports the provider, then the
+              # box has no support for the provider
+              if !metadata.version(">= 0", provider: provider)
+                raise Errors::BoxAddNoMatchingProvider,
+                  name: metadata.name,
+                  requested: Array(provider).join(", "),
+                  url: display_url
+              end
+
+              # Get all versions that support the provider and architecture
+              available_versions = metadata.versions(
+                provider: provider,
+                architecture: architecture
+              )
+
+              # If no versions are found, then the box does not provide
+              # support for the requested architecture using the requested
+              # architecture
+              if available_versions.empty?
+                supported_providers = metadata.versions(architecture: architecture).map do |v|
+                  metadata.version(v).providers(architecture)
+                end.compact.uniq.sort
+
+                # If no providers are found, then the box does not
+                # have any support for the requested architecture
+                if supported_providers.empty?
+                  raise Errors::BoxAddNoArchitectureSupport,
+                    architecture: display_architecture,
+                    name: metadata.name,
+                    url: display_url
+                end
+
+                raise Errors::BoxAddNoMatchingArchitecture,
+                  provider: Array(provider).join(", "),
+                  architecture: display_architecture,
+                  name: metadata.name,
+                  url: display_url,
+                  supported_providers: supported_providers
+              end
+
+              raise Errors::BoxAddNoMatchingProviderVersion,
+                constraints: version || ">= 0",
+                provider: Array(provider).join(", "),
+                architecture: display_architecture,
                 name: metadata.name,
-                requested: [provider,
-                  display_architecture ? "(#{display_architecture})" : nil
-                ].compact.join(" "),
-                url: display_url
+                url: display_url,
+                versions: available_versions.reverse.join(", ")
             else
+              # Report that no version can match the constraints requested
+              # but show what versions are supported
               raise Errors::BoxAddNoMatchingVersion,
                 constraints: version || ">= 0",
                 name: metadata.name,
                 url: display_url,
-                versions: metadata.versions.join(", ")
+                versions: metadata.versions(architecture: architecture).reverse.join(", ")
             end
           end
 

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

@@ -16,16 +16,38 @@ module Vagrant
         end
 
         def call(env)
-          machine = env[:machine]
+          catch(:complete) do
+            machine = env[:machine]
+
+            # The sentinel file in this check is written by the cloud init
+            # wait action and is only written after cloud init has completed.
+            @logger.info("Checking cloud-init sentinel file...")
+            sentinel_path = machine.data_dir.join("action_cloud_init")
+            if sentinel_path.file?
+              contents = sentinel_path.read.chomp
+              if machine.id.to_s == contents
+                if machine.config.vm.cloud_init_first_boot_only
+                  @logger.info("Sentinel found for cloud-init, skipping")
+                  throw :complete
+                else
+                  @logger.info("Sentinel found for cloud-init but is configuration enabled")
+                end
+              else
+                @logger.debug("Found stale sentinel file, removing... (#{machine.id} != #{contents})")
+              end
+              sentinel_path.unlink
+            end
 
-          user_data_configs = machine.config.vm.cloud_init_configs
-                                                  .select { |c| c.type == :user_data }
+            user_data_configs = machine.config.vm.cloud_init_configs.select { |c|
+              c.type == :user_data
+            }
 
-          if !user_data_configs.empty?
-            user_data = setup_user_data(machine, env, user_data_configs)
-            meta_data = { "instance-id" => "i-#{machine.id.split('-').join}" }
+            if !user_data_configs.empty?
+              user_data = setup_user_data(machine, env, user_data_configs)
+              meta_data = { "instance-id" => "i-#{machine.id.split('-').join}" }
 
-            write_cfg_iso(machine, env, user_data, meta_data)
+              write_cfg_iso(machine, env, user_data, meta_data)
+            end
           end
 
           # Continue On
@@ -88,24 +110,43 @@ module Vagrant
         # @param [Vagrant::Util::Mime::Multipart] user_data
         # @param [Hash] meta_data
         def write_cfg_iso(machine, env, user_data, meta_data)
-          iso_path = nil
+          raise Errors::CreateIsoHostCapNotFound if !env[:env].host.capability?(:create_iso)
+
+          iso_path = catch(:iso_path) do
+            # This iso sentinel file is used to store the path of the
+            # generated iso file and its checksum. If the file does
+            # not exist, or the actual checksum of the file does not
+            # match that stored in the sentinel file, it is ignored
+            # and the iso is generated. This is used to prevent multiple
+            # iso file from being created over time.
+            iso_sentinel = env[:machine].data_dir.join("action_cloud_init_iso")
+            if iso_sentinel.file?
+              checksum, path = iso_sentinel.read.chomp.split(":", 2)
+              if File.exist?(path) && Vagrant::Util::FileChecksum.new(path, :sha256).checksum == checksum
+                throw :iso_path, Pathname.new(path)
+              end
+              iso_sentinel.unlink
+            end
 
-          if env[:env].host.capability?(:create_iso)
             begin
               source_dir = Pathname.new(Dir.mktmpdir(TEMP_PREFIX))
               File.open("#{source_dir}/user-data", 'w') { |file| file.write(user_data.to_s) }
-
               File.open("#{source_dir}/meta-data", 'w') { |file| file.write(meta_data.to_yaml) }
 
-              iso_path = env[:env].host.capability(:create_iso,
-                                                   source_dir, volume_id: "cidata")
-              attach_disk_config(machine, env, iso_path.to_path)
+              env[:env].host.capability(
+                :create_iso,
+                source_dir,
+                volume_id: "cidata"
+              ).tap { |path|
+                checksum = Vagrant::Util::FileChecksum.new(path.to_path, :sha256).checksum
+                iso_sentinel.write("#{checksum}:#{path.to_path}")
+              }
             ensure
               FileUtils.remove_entry(source_dir)
             end
-          else
-            raise Errors::CreateIsoHostCapNotFound
           end
+
+          attach_disk_config(machine, env, iso_path.to_path)
         end
 
         # Adds a new :dvd disk config with the given iso_path to be attached

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

@@ -14,19 +14,37 @@ module Vagrant
         end
 
         def call(env)
-          machine = env[:machine]
-          cloud_init_wait_cmd = "cloud-init status --wait"
-          if !machine.config.vm.cloud_init_configs.empty?
-            if machine.communicate.test("command -v cloud-init")
-              env[:ui].output(I18n.t("vagrant.cloud_init_waiting"))
-              result = machine.communicate.sudo(cloud_init_wait_cmd, error_check: false)
-              if result != 0
-                raise Vagrant::Errors::CloudInitCommandFailed, cmd: cloud_init_wait_cmd, guest_name: machine.name
+          catch(:complete) do
+            machine = env[:machine]
+            sentinel_path = machine.data_dir.join("action_cloud_init")
+
+            @logger.info("Checking cloud-init sentinel file...")
+            if sentinel_path.file?
+              contents = sentinel_path.read.chomp
+              if machine.id.to_s == contents
+                @logger.info("Sentinel found for cloud-init, skipping")
+                throw :complete
               end
-            else
-              raise Vagrant::Errors::CloudInitNotFound, guest_name: machine.name
+              @logger.debug("Found stale sentinel file, removing... (#{machine.id} != #{contents})")
+              sentinel_path.unlink
             end
+
+            cloud_init_wait_cmd = "cloud-init status --wait"
+            if !machine.config.vm.cloud_init_configs.empty?
+              if machine.communicate.test("command -v cloud-init")
+                env[:ui].output(I18n.t("vagrant.cloud_init_waiting"))
+                result = machine.communicate.sudo(cloud_init_wait_cmd, error_check: false)
+                if result != 0
+                  raise Vagrant::Errors::CloudInitCommandFailed, cmd: cloud_init_wait_cmd, guest_name: machine.name
+                end
+              else
+                raise Vagrant::Errors::CloudInitNotFound, guest_name: machine.name
+              end
+            end
+            # Write sentinel path
+            sentinel_path.write(machine.id.to_s)
           end
+
           @app.call(env)
         end
       end

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

@@ -27,7 +27,10 @@ module Vagrant
             end
           end
 
-          write_disk_metadata(machine, configured_disks) unless configured_disks.empty?
+          # Always write the disk metadata even if the configured
+          # disks is empty. This ensure that old entries are not
+          # orphaned in the metadata file.
+          write_disk_metadata(machine, configured_disks)
 
           # Continue On
           @app.call(env)

data/lib/vagrant/box_metadata.rb

@@ -49,6 +49,9 @@ module Vagrant
     #
     # @param [String] version The version to return, this can also
     #   be a constraint.
+    # @option [Symbol, Array<Symbol>] :provider Provider filter
+    # @option [Symbol] :architecture Architecture filter
+    #
     # @return [Version] The matching version or nil if a matching
     #   version was not found.
     def version(version, **opts)
@@ -90,10 +93,13 @@ module Vagrant
     # latest version. Optionally filter versions by a matching
     # provider.
     #
+    # @option [Symbol, Array<Symbol>] :provider Provider filter
+    # @option [Symbol] :architecture Architecture filter
+    #
     # @return[Array<String>]
     def versions(**opts)
       architecture = opts[:architecture]
-      provider = opts[:provider].to_sym if opts[:provider]
+      provider = Array(opts[:provider]).map(&:to_sym) if opts[:provider]
 
       # Return full version list if no filters provided
       if provider.nil? && architecture.nil?
@@ -109,7 +115,7 @@ module Vagrant
       end
 
       @version_map.select { |_, version|
-        version.provider(provider, architecture)
+        provider.any? { |pv| version.provider(pv, architecture) }
       }.keys.sort.map(&:to_s)
     end
 

data/lib/vagrant/errors.rb

@@ -139,6 +139,18 @@ module Vagrant
       error_key(:box_add_no_matching_provider)
     end
 
+    class BoxAddNoArchitectureSupport < VagrantError
+      error_key(:box_add_no_architecture_support)
+    end
+
+    class BoxAddNoMatchingArchitecture < VagrantError
+      error_key(:box_add_no_matching_architecture)
+    end
+
+    class BoxAddNoMatchingProviderVersion < VagrantError
+      error_key(:box_add_no_matching_provider_version)
+    end
+
     class BoxAddNoMatchingVersion < VagrantError
       error_key(:box_add_no_matching_version)
     end
@@ -607,6 +619,10 @@ module Vagrant
       error_key(:no_env)
     end
 
+    class OscdimgCommandMissingError < VagrantError
+      error_key(:oscdimg_command_missing)
+    end
+
     class PackageIncludeMissing < VagrantError
       error_key(:include_file_missing, "vagrant.actions.general.package")
     end

data/lib/vagrant/util/file_checksum.rb

@@ -13,65 +13,74 @@ class DigestClass
   def hexdigest; end
 end
 
-class FileChecksum
-  BUFFER_SIZE = 1024 * 8
+module Vagrant
+  module Util
+    class FileChecksum
+      BUFFER_SIZE = 1024 * 8
 
-  # Supported file checksum
-  CHECKSUM_MAP = {
-    :md5 => Digest::MD5,
-    :sha1 => Digest::SHA1,
-    :sha256 => Digest::SHA256,
-    :sha384 => Digest::SHA384,
-    :sha512 => Digest::SHA512
-  }.freeze
+      # Supported file checksum
+      CHECKSUM_MAP = {
+        :md5 => Digest::MD5,
+        :sha1 => Digest::SHA1,
+        :sha256 => Digest::SHA256,
+        :sha384 => Digest::SHA384,
+        :sha512 => Digest::SHA512
+      }.freeze
 
-  # Initializes an object to calculate the checksum of a file. The given
-  # ``digest_klass`` should implement the ``DigestClass`` interface. Note
-  # that the built-in Ruby digest classes duck type this properly:
-  # Digest::MD5, Digest::SHA1, etc.
-  def initialize(path, digest_klass)
-    if digest_klass.is_a?(Class)
-      @digest_klass = digest_klass
-    else
-      @digest_klass = load_digest(digest_klass)
-    end
+      # Initializes an object to calculate the checksum of a file. The given
+      # ``digest_klass`` should implement the ``DigestClass`` interface. Note
+      # that the built-in Ruby digest classes duck type this properly:
+      # Digest::MD5, Digest::SHA1, etc.
+      def initialize(path, digest_klass)
+        if digest_klass.is_a?(Class)
+          @digest_klass = digest_klass
+        else
+          @digest_klass = load_digest(digest_klass)
+        end
 
-    @path = path
-  end
+        @path = path
+      end
 
-  # This calculates the checksum of the file and returns it as a
-  # string.
-  #
-  # @return [String]
-  def checksum
-    digest = @digest_klass.new
-    buf = ''
+      # This calculates the checksum of the file and returns it as a
+      # string.
+      #
+      # @return [String]
+      def checksum
+        digest = @digest_klass.new
+        buf = ''
 
-    File.open(@path, "rb") do |f|
-      while !f.eof
-        begin
-          f.readpartial(BUFFER_SIZE, buf)
-          digest.update(buf)
-        rescue EOFError
-          # Although we check for EOF earlier, this seems to happen
-          # sometimes anyways [GH-2716].
-          break
+        File.open(@path, "rb") do |f|
+          while !f.eof
+            begin
+              f.readpartial(BUFFER_SIZE, buf)
+              digest.update(buf)
+            rescue EOFError
+              # Although we check for EOF earlier, this seems to happen
+              # sometimes anyways [GH-2716].
+              break
+            end
+          end
         end
-      end
-    end
 
-    digest.hexdigest
-  end
+        digest.hexdigest
+      end
 
-  private
+      private
 
-  def load_digest(type)
-    digest = CHECKSUM_MAP[type.to_s.downcase.to_sym]
-    if digest.nil?
-      raise Vagrant::Errors::BoxChecksumInvalidType,
-        type: type.to_s,
-        types: CHECKSUM_MAP.keys.join(', ')
+      def load_digest(type)
+        digest = CHECKSUM_MAP[type.to_s.downcase.to_sym]
+        if digest.nil?
+          raise Vagrant::Errors::BoxChecksumInvalidType,
+                type: type.to_s,
+                types: CHECKSUM_MAP.keys.join(', ')
+        end
+        digest
+      end
     end
-    digest
   end
 end
+
+# NOTE: This class was not originally namespaced
+# with the Util module so this is left for backwards
+# compatibility.
+FileChecksum = Vagrant::Util::FileChecksum

data/lib/vagrant/util/mime.rb

@@ -70,7 +70,7 @@ module Vagrant
         # @param [String] type of the entity content
         def initialize(content, content_type)
           if !MIME::Types.include?(content_type)
-            MIME::Types.add(MIME::Type.new(content_type))
+            MIME::Types.add(MIME::Type.new("content-type" => content_type))
           end
           @content = content
           @content_type = MIME::Types[content_type].first

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

@@ -43,18 +43,16 @@ module VagrantPlugins
         def help
           opts = OptionParser.new do |opts|
             opts.banner = "Usage: vagrant autocomplete <subcommand>"
-            if !Vagrant.server_mode?
-              opts.separator ""
-              opts.separator "Available subcommands:"
+            opts.separator ""
+            opts.separator "Available subcommands:"
 
-              # Add the available subcommands as separators in order to print them
-              # out as well.
-              keys = []
-              keys = @subcommands.keys.map(&:to_s)
+            # Add the available subcommands as separators in order to print them
+            # out as well.
+            keys = []
+            keys = @subcommands.keys.map(&:to_s)
 
-              keys.sort.each do |key|
-                opts.separator "     #{key}"
-              end
+            keys.sort.each do |key|
+              opts.separator "     #{key}"
             end
 
             opts.separator ""

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

@@ -73,18 +73,16 @@ module VagrantPlugins
         def help
           opts = OptionParser.new do |opts|
             opts.banner = "Usage: vagrant box <subcommand> [<args>]"
-            if !Vagrant.server_mode?
-              opts.separator ""
-              opts.separator "Available subcommands:"
-
-              # Add the available subcommands as separators in order to print them
-              # out as well.
-              keys = []
-              @subcommands.each { |key, value| keys << key.to_s }
-
-              keys.sort.each do |key|
-                opts.separator "     #{key}"
-              end
+            opts.separator ""
+            opts.separator "Available subcommands:"
+
+            # Add the available subcommands as separators in order to print them
+            # out as well.
+            keys = []
+            @subcommands.each { |key, value| keys << key.to_s }
+
+            keys.sort.each do |key|
+              opts.separator "     #{key}"
             end
             opts.separator ""
             opts.separator "For help on any individual subcommand run `vagrant box <subcommand> -h`"

data/plugins/commands/cloud/auth/root.rb

@@ -51,18 +51,16 @@ module VagrantPlugins
               opts.banner = "Usage: vagrant cloud auth <subcommand> [<args>]"
               opts.separator ""
               opts.separator "Authorization with Vagrant Cloud"
-              if !Vagrant.server_mode?
-                opts.separator ""
-                opts.separator "Available subcommands:"
-  
-                # Add the available subcommands as separators in order to print them
-                # out as well.
-                keys = []
-                @subcommands.each { |key, value| keys << key.to_s }
-  
-                keys.sort.each do |key|
-                  opts.separator "     #{key}"
-                end
+              opts.separator ""
+              opts.separator "Available subcommands:"
+
+              # Add the available subcommands as separators in order to print them
+              # out as well.
+              keys = []
+              @subcommands.each { |key, value| keys << key.to_s }
+
+              keys.sort.each do |key|
+                opts.separator "     #{key}"
               end
               opts.separator ""
               opts.separator "For help on any individual subcommand run `vagrant cloud auth <subcommand> -h`"

data/plugins/commands/cloud/box/root.rb

@@ -55,18 +55,16 @@ module VagrantPlugins
               opts.banner = "Usage: vagrant cloud box <subcommand> [<args>]"
               opts.separator ""
               opts.separator "Commands to manage boxes on Vagrant Cloud"
-              if !Vagrant.server_mode?
-                opts.separator ""
-                opts.separator "Available subcommands:"
-  
-                # Add the available subcommands as separators in order to print them
-                # out as well.
-                keys = []
-                @subcommands.each { |key, value| keys << key.to_s }
-  
-                keys.sort.each do |key|
-                  opts.separator "     #{key}"
-                end
+              opts.separator ""
+              opts.separator "Available subcommands:"
+
+              # Add the available subcommands as separators in order to print them
+              # out as well.
+              keys = []
+              @subcommands.each { |key, value| keys << key.to_s }
+
+              keys.sort.each do |key|
+                opts.separator "     #{key}"
               end
               opts.separator ""
               opts.separator "For help on any individual subcommand run `vagrant cloud box <subcommand> -h`"

data/plugins/commands/cloud/provider/root.rb

@@ -55,18 +55,16 @@ module VagrantPlugins
               opts.banner = "Usage: vagrant cloud provider <subcommand> [<args>]"
               opts.separator ""
               opts.separator "For various provider actions with Vagrant Cloud"
-              if !Vagrant.server_mode?
-                opts.separator ""
-                opts.separator "Available subcommands:"
-  
-                # Add the available subcommands as separators in order to print them
-                # out as well.
-                keys = []
-                @subcommands.each { |key, value| keys << key.to_s }
-  
-                keys.sort.each do |key|
-                  opts.separator "     #{key}"
-                end
+              opts.separator ""
+              opts.separator "Available subcommands:"
+
+              # Add the available subcommands as separators in order to print them
+              # out as well.
+              keys = []
+              @subcommands.each { |key, value| keys << key.to_s }
+
+              keys.sort.each do |key|
+                opts.separator "     #{key}"
               end
               opts.separator ""
               opts.separator "For help on any individual subcommand run `vagrant cloud provider <subcommand> -h`"

data/plugins/commands/cloud/root.rb

@@ -83,18 +83,16 @@ module VagrantPlugins
             opts.separator ""
             opts.separator "The cloud command can be used for taking actions against"
             opts.separator "Vagrant Cloud like searching or uploading a Vagrant Box"
-            if !Vagrant.server_mode?
-              opts.separator ""
-              opts.separator "Available subcommands:"
-  
-              # Add the available subcommands as separators in order to print them
-              # out as well.
-              keys = []
-              @subcommands.each { |key, value| keys << key.to_s }
-  
-              keys.sort.each do |key|
-                opts.separator "     #{key.ljust(15)} #{@subcommand_helptext[key.to_sym]}"
-              end
+            opts.separator ""
+            opts.separator "Available subcommands:"
+
+            # Add the available subcommands as separators in order to print them
+            # out as well.
+            keys = []
+            @subcommands.each { |key, value| keys << key.to_s }
+
+            keys.sort.each do |key|
+              opts.separator "     #{key.ljust(15)} #{@subcommand_helptext[key.to_sym]}"
             end
             opts.separator ""
             opts.separator "For help on any individual subcommand run `vagrant cloud <subcommand> -h`"

data/plugins/commands/cloud/version/root.rb

@@ -59,18 +59,16 @@ module VagrantPlugins
               opts.banner = "Usage: vagrant cloud version <subcommand> [<args>]"
               opts.separator ""
               opts.separator "For taking various actions against a Vagrant box's version attribute on Vagrant Cloud"
-              if !Vagrant.server_mode?
-                opts.separator ""
-                opts.separator "Available subcommands:"
-  
-                # Add the available subcommands as separators in order to print them
-                # out as well.
-                keys = []
-                @subcommands.each { |key, value| keys << key.to_s }
-  
-                keys.sort.each do |key|
-                  opts.separator "     #{key}"
-                end
+              opts.separator ""
+              opts.separator "Available subcommands:"
+
+              # Add the available subcommands as separators in order to print them
+              # out as well.
+              keys = []
+              @subcommands.each { |key, value| keys << key.to_s }
+
+              keys.sort.each do |key|
+                opts.separator "     #{key}"
               end
               opts.separator ""
               opts.separator "For help on any individual subcommand run `vagrant cloud version <subcommand> -h`"

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

@@ -73,18 +73,16 @@ module VagrantPlugins
         def help
           opts = OptionParser.new do |o|
             o.banner = "Usage: vagrant plugin <command> [<args>]"
-            if !Vagrant.server_mode?
-              o.separator ""
-              o.separator "Available subcommands:"
-  
-              # Add the available subcommands as separators in order to print them
-              # out as well.
-              keys = []
-              @subcommands.each { |key, value| keys << key.to_s }
-  
-              keys.sort.each do |key|
-                o.separator "     #{key}"
-              end
+            o.separator ""
+            o.separator "Available subcommands:"
+
+            # Add the available subcommands as separators in order to print them
+            # out as well.
+            keys = []
+            @subcommands.each { |key, value| keys << key.to_s }
+
+            keys.sort.each do |key|
+              o.separator "     #{key}"
             end
             o.separator ""
             o.separator "For help on any individual command run `vagrant plugin COMMAND -h`"

data/plugins/hosts/windows/cap/fs_iso.rb

@@ -12,14 +12,22 @@ module VagrantPlugins
 
         @@logger = Log4r::Logger.new("vagrant::host::windows::fs_iso")
 
-        BUILD_ISO_CMD = "oscdimg".freeze
+        BUILD_ISO_CMD = "oscdimg.exe".freeze
+        DEPLOYMENT_KIT_PATHS = [
+          "C:/Program Files (x86)/Windows Kits/10/Assessment and Deployment Kit/Deployment Tools".freeze,
+        ].freeze
 
         # Check that the host has the ability to generate ISOs
         #
         # @param [Vagrant::Environment] env
         # @return [Boolean]
         def self.isofs_available(env)
-          !!Vagrant::Util::Which.which(BUILD_ISO_CMD)
+          begin
+            oscdimg_path
+            true
+          rescue Vagrant::Errors::OscdimgCommandMissingError
+            false
+          end
         end
 
         # Generate an ISO file of the given source directory
@@ -36,7 +44,7 @@ module VagrantPlugins
           source_directory = Pathname.new(source_directory)
           file_destination = self.ensure_output_iso(extra_opts[:file_destination])
 
-          iso_command = [BUILD_ISO_CMD, "-j1", "-o", "-m"]
+          iso_command = [oscdimg_path, "-j1", "-o", "-m"]
           iso_command << "-l#{extra_opts[:volume_id]}" if extra_opts[:volume_id]
           iso_command << source_directory.to_s
           iso_command << file_destination.to_s
@@ -45,6 +53,20 @@ module VagrantPlugins
           @@logger.info("ISO available at #{file_destination}")
           file_destination
         end
+
+        # @return [String] oscdimg executable
+        def self.oscdimg_path
+          return BUILD_ISO_CMD if Vagrant::Util::Which.which(BUILD_ISO_CMD)
+          @@logger.debug("#{BUILD_ISO_CMD} not found on PATH")
+          DEPLOYMENT_KIT_PATHS.each do |base|
+            path = File.join(base, Vagrant::Util::Platform.architecture,
+              "Oscdimg", BUILD_ISO_CMD)
+            @@logger.debug("#{BUILD_ISO_CMD} check at #{path}")
+            return path if File.executable?(path)
+          end
+
+          raise Vagrant::Errors::OscdimgCommandMissingError
+        end
       end
     end
   end

data/plugins/kernel_v2/config/vm.rb

@@ -47,6 +47,7 @@ module VagrantPlugins
       attr_accessor :box_download_insecure
       attr_accessor :box_download_location_trusted
       attr_accessor :box_download_options
+      attr_accessor :cloud_init_first_boot_only
       attr_accessor :communicator
       attr_accessor :graceful_halt_timeout
       attr_accessor :guest
@@ -87,6 +88,7 @@ module VagrantPlugins
         @box_version                   = UNSET_VALUE
         @allow_hosts_modification      = UNSET_VALUE
         @clone                         = UNSET_VALUE
+        @cloud_init_first_boot_only    = UNSET_VALUE
         @communicator                  = UNSET_VALUE
         @graceful_halt_timeout         = UNSET_VALUE
         @guest                         = UNSET_VALUE
@@ -536,6 +538,7 @@ module VagrantPlugins
         @box_extra_download_options = Vagrant::Util::MapCommandOptions.map_to_command_options(@box_download_options)
         @allow_hosts_modification = true if @allow_hosts_modification == UNSET_VALUE
         @clone = nil if @clone == UNSET_VALUE
+        @cloud_init_first_boot_only = @cloud_init_first_boot_only == UNSET_VALUE ? true : !!@cloud_init_first_boot_only
         @communicator = nil if @communicator == UNSET_VALUE
         @graceful_halt_timeout = 60 if @graceful_halt_timeout == UNSET_VALUE
         @guest = nil if @guest == UNSET_VALUE

data/plugins/providers/hyperv/action/import.rb

@@ -70,14 +70,28 @@ module VagrantPlugins
             "LinkedClone" => !!env[:machine].provider_config.linked_clone,
             "SourcePath" => Vagrant::Util::Platform.wsl_to_windows_path(image_path).gsub("/", "\\"),
             "VMName" => env[:machine].provider_config.vmname,
+            "Memory" => env[:machine].provider_config.memory,
+            "MaxMemory" => env[:machine].provider_config.maxmemory,
+            "Processors" => env[:machine].provider_config.cpus,
           }
 
-
           env[:ui].detail("Creating and registering the VM...")
           server = env[:machine].provider.driver.import(options)
 
+          @logger.debug("import result value: #{server.inspect}")
+
+          sid = case server["id"]
+                when String
+                  server["id"]
+                when Array
+                  server["id"].first
+                else
+                  raise TypeError,
+                    "Expected String or Array value, received: #{server["id"].class}"
+                end
+
           env[:ui].detail("Successfully imported VM")
-          env[:machine].id = server["id"]
+          env[:machine].id = sid
           @app.call(env)
         end
       end

data/plugins/providers/hyperv/action.rb

@@ -152,12 +152,14 @@ module VagrantPlugins
                   b3.use NetSetMac
                 end
 
+                b3.use CloudInitSetup
                 b3.use CleanupDisks
                 b3.use Disk
                 b3.use SyncedFolderCleanup
                 b3.use StartInstance
                 b3.use WaitForIPAddress
                 b3.use WaitForCommunicator, [:running]
+                b3.use CloudInitWait
                 b3.use SyncedFolders
                 b3.use SetHostname
               end

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

@@ -15,6 +15,12 @@ param(
     [parameter (Mandatory=$false)]
     [switch] $LinkedClone,
     [parameter (Mandatory=$false)]
+    [int] $Memory = $null,
+    [parameter (Mandatory=$false)]
+    [int] $MaxMemory = $null,
+    [parameter (Mandatory=$false)]
+    [int] $Processors = $null,
+    [parameter (Mandatory=$false)]
     [string] $VMName=$null
 )
 
@@ -28,7 +34,8 @@ try {
     }
 
     $VM = New-VagrantVM -VMConfigFile $VMConfigFile -DestinationPath $DestinationPath `
-      -DataPath $DataPath -SourcePath $SourcePath -LinkedClone $linked -VMName $VMName
+      -DataPath $DataPath -SourcePath $SourcePath -LinkedClone $linked -Memory $Memory `
+      -MaxMemory $MaxMemory -CPUCount $Processors -VMName $VMName
 
     $Result = @{
         id = $VM.Id.Guid;

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

@@ -33,6 +33,12 @@ function New-VagrantVM {
         [string] $SourcePath,
         [parameter (Mandatory=$false)]
         [bool] $LinkedClone = $false,
+        [parameter (Mandatory=$false)]
+        [int] $Memory = $null,
+        [parameter (Mandatory=$false)]
+        [int] $MaxMemory = $null,
+        [parameter (Mandatory=$false)]
+        [int] $CPUCount = $null,
         [parameter(Mandatory=$false)]
         [string] $VMName
     )
@@ -93,6 +99,12 @@ function New-VagrantVMVMCX {
         [string] $SourcePath,
         [parameter (Mandatory=$false)]
         [bool] $LinkedClone = $false,
+        [parameter (Mandatory=$false)]
+        [int] $Memory = $null,
+        [parameter (Mandatory=$false)]
+        [int] $MaxMemory = $null,
+        [parameter (Mandatory=$false)]
+        [int] $CPUCount = $null,
         [parameter(Mandatory=$false)]
         [string] $VMName
     )
@@ -127,6 +139,16 @@ function New-VagrantVMVMCX {
     # Disconnect adapters from switches
     Hyper-V\Get-VMNetworkAdapter -VM $VM | Hyper-V\Disconnect-VMNetworkAdapter
 
+    # If we have a memory value provided, set it here
+    if($Memory -ne $null) {
+        Set-VagrantVMMemory -VM $VM -Memory $Memory -MaxMemory $MaxMemory
+    }
+
+    # If we have a CPU count provided, set it here
+    if($CPUCount -ne $null) {
+        Set-VagrantVMCPUS -VM $VM -CPUCount $CPUCount
+    }
+
     # Verify new VM
     $Report = Hyper-V\Compare-VM -CompatibilityReport $VMConfig
     if($Report.Incompatibilities.Length -gt 0){

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

@@ -27,7 +27,10 @@ module VagrantPlugins
         # 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
+        HOSTONLY_DEFAULT_RANGE = [
+          IPAddr.new("192.168.56.0/21").freeze,
+          IPAddr.new("fe80::/10").freeze
+        ].freeze
 
         include Vagrant::Util::NetworkIP
         include Vagrant::Util::ScopedHashOverride
@@ -359,9 +362,9 @@ module VagrantPlugins
           # Find the hostonly interface name if display name was
           # provided
           if options[:name]
-            hostif = @env[:machine].provider.driver.read_host_only_networks.detect { |interface|
+            hostif = @env[:machine].provider.driver.read_host_only_interfaces.detect { |interface|
               interface[:name] == options[:name] ||
-                interface[:vboxnetworkname] == options[:name]
+                interface[:display_name] == options[:name]
             }
             options[:name] = hostif[:name] if hostif
           end

data/plugins/providers/virtualbox/action.rb

@@ -82,22 +82,14 @@ module VagrantPlugins
           b.use ForwardPorts
           b.use SetHostname
           b.use SaneDefaults
-          b.use Call, IsEnvSet, :cloud_init do |env, b2|
-            if env[:result]
-              b2.use CloudInitSetup
-            end
-          end
+          b.use CloudInitSetup
           b.use CleanupDisks
           b.use Disk
           b.use Customize, "pre-boot"
           b.use Boot
           b.use Customize, "post-boot"
           b.use WaitForCommunicator, [:starting, :running, :paused]
-          b.use Call, IsEnvSet, :cloud_init do |env, b2|
-            if env[:result]
-              b2.use CloudInitWait
-            end
-          end
+          b.use CloudInitWait
           b.use Customize, "post-comm"
           b.use CheckGuestAdditions
         end
@@ -424,7 +416,6 @@ module VagrantPlugins
             end
           end
 
-          b.use EnvSet, cloud_init: true
           b.use action_start
         end
       end

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

@@ -256,10 +256,11 @@ module VagrantPlugins
         # Each interface is represented as a Hash with the following details:
         #
         # {
-        #  :name    => String, # interface name, e.g. "vboxnet0"
-        #  :ip      => String, # IP address of the interface, e.g. "172.28.128.1"
-        #  :netmask => String, # netmask associated with the interface, e.g. "255.255.255.0"
-        #  :status  => String, # status of the interface, e.g. "Up", "Down"
+        #  :name         => String, # interface name, e.g. "vboxnet0"
+        #  :ip           => String, # IP address of the interface, e.g. "172.28.128.1"
+        #  :netmask      => String, # netmask associated with the interface, e.g. "255.255.255.0"
+        #  :status       => String, # status of the interface, e.g. "Up", "Down"
+        #  :display_name => String, # user friendly display name if available
         # }
         #
         # @return [Array<Hash>] See comment above for details

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

@@ -134,6 +134,7 @@ module VagrantPlugins
           :read_guest_ip,
           :read_guest_property,
           :read_host_only_interfaces,
+          :read_host_only_networks,
           :read_mac_address,
           :read_mac_addresses,
           :read_machine_folder,

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

@@ -345,6 +345,8 @@ module VagrantPlugins
                 info[:ipv6_prefix] = $1.to_s.strip
               elsif status = line[/^Status:\s+(.+?)$/, 1]
                 info[:status] = status
+              elsif line =~ /^VBoxNetworkName:\s+(.+?)$/
+                info[:display_name] = $1.to_s
               end
             end
 

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

@@ -447,6 +447,8 @@ module VagrantPlugins
                 info[:ipv6_prefix] = $1.to_s.strip
               elsif status = line[/^Status:\s+(.+?)$/, 1]
                 info[:status] = status
+              elsif line =~ /^VBoxNetworkName:\s+(.+?)$/
+                info[:display_name] = $1.to_s
               end
             end
 

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

@@ -381,6 +381,8 @@ module VagrantPlugins
                 info[:ipv6_prefix] = $1.to_s.strip
               elsif line =~ /^Status:\s+(.+?)$/
                 info[:status] = $1.to_s
+              elsif line =~ /^VBoxNetworkName:\s+(.+?)$/
+                info[:display_name] = $1.to_s
               end
             end
 

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

@@ -492,6 +492,8 @@ module VagrantPlugins
                 info[:ipv6_prefix] = $1.to_s.strip
               elsif line =~ /^Status:\s+(.+?)$/
                 info[:status] = $1.to_s
+              elsif line =~ /^VBoxNetworkName:\s+(.+?)$/
+                info[:display_name] = $1.to_s
               end
             end
 

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

@@ -635,6 +635,8 @@ module VagrantPlugins
                 info[:ipv6_prefix] = $1.to_s.strip
               elsif line =~ /^Status:\s+(.+?)$/
                 info[:status] = $1.to_s
+              elsif line =~ /^VBoxNetworkName:\s+(.+?)$/
+                info[:display_name] = $1.to_s
               end
             end
 

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

@@ -215,26 +215,6 @@ module VagrantPlugins
           end
         end
 
-        # Generate list of host only networks
-        def read_host_only_networks
-          networks = []
-          current = nil
-          execute("list", "hostonlynets", retryable: true).split("\n").each do |line|
-            line.chomp!
-            next if line.empty?
-            key, value = line.split(":", 2).map(&:strip)
-            key = key.downcase
-            if key == "name"
-              networks.push(current) if !current.nil?
-              current = Vagrant::Util::HashWithIndifferentAccess.new
-            end
-            current[key] = value
-          end
-          networks.push(current) if !current.nil?
-
-          networks
-        end
-
         # The initial VirtualBox 7.0 release has an issue with displaying port
         # forward information. When a single port forward is defined, the forwarding
         # information can be found in the `showvminfo` output. Once more than a
@@ -282,6 +262,29 @@ module VagrantPlugins
           results
         end
 
+        protected
+
+        # Generate list of host only networks
+        # NOTE: This is darwin specific
+        def read_host_only_networks
+          networks = []
+          current = nil
+          execute("list", "hostonlynets", retryable: true).split("\n").each do |line|
+            line.chomp!
+            next if line.empty?
+            key, value = line.split(":", 2).map(&:strip)
+            key = key.downcase
+            if key == "name"
+              networks.push(current) if !current.nil?
+              current = Vagrant::Util::HashWithIndifferentAccess.new
+            end
+            current[key] = value
+          end
+          networks.push(current) if !current.nil?
+
+          networks
+        end
+
         private
 
         # Returns if hostonlynets are enabled on the current

data/templates/locales/en.yml

@@ -510,6 +510,41 @@ en:
         Name: %{name}
         Address: %{url}
         Requested provider: %{requested}
+      box_add_no_architecture_support: |-
+        The box you're attempting to add doesn't support the requested
+        architecture. Please find an alternate box that support the
+        requested architecture.
+
+        Box: %{name}
+        Address: %{url}
+        Architecture: %{architecture}
+      box_add_no_matching_architecture: |-
+        The box you're attempting to add doesn't support the requested
+        architecture with the current provider. The following providers
+        support the requested architecture for this box:
+
+          %{supported_providers}
+
+        If the above providers cannot be used, please find and alternate
+        box that supports the requested architecture.
+
+        Box: %{name}
+        Address: %{url}
+        Architecture: %{architecture}
+        Provider: %{provider}
+      box_add_no_matching_provider_version: |-
+        The box you're attempting to add has no available version that
+        matches the constraints you requested with support for the
+        required provider and architecture. Versions of the box that
+        support the required provider and architecture are listed
+        below.
+
+        Box: %{name}
+        Address: %{url}
+        Constraints: %{constraints}
+        Architecture: %{architecture}
+        Provider: %{provider}
+        Supported versions: %{versions}
       box_add_no_matching_version: |-
         The box you're attempting to add has no available version that
         matches the constraints you requested. Please double-check your
@@ -1215,6 +1250,14 @@ en:
         get an ID of a target machine from `vagrant global-status` to run
         this command on. A final option is to change to a directory with a
         Vagrantfile and to try again.
+      oscdimg_command_missing: |-
+        Vagrant failed to locate the oscdimg.exe executable which is required
+        for creating ISO files. Please ensure the oscdimg.exe executable is
+        available on the configured PATH. If the oscdimg.exe executable is
+        not found on the local system, it can be installed with the Windows
+        Assessment and Deployment Kit:
+
+          https://go.microsoft.com/fwlink/?linkid=2196127
       plugin_gem_not_found: |-
         The plugin '%{name}' could not be installed because it could not
         be found. Please double check the name and try again.

data/version.txt

@@ -1 +1 @@
-2.4.5
+2.4.6

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant
 version: !ruby/object:Gem::Version
-  version: 2.4.5
+  version: 2.4.6
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-23 00:00:00.000000000 Z
+date: 2025-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64