vagrant 2.4.4 → 2.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 224d3813ea9dced5e3fd7bdb4b333292f7457f9b66207e3bbe512ed842822e35
-  data.tar.gz: 1e1829feabf687bdaa50321e59bca502f51edf028059812973d1e4a83cd2ea36
+  metadata.gz: 0626c2a374eefa0d6beab52f299d0d1ecaf4855ae7f53dc1a29bc4bb3372fb97
+  data.tar.gz: d37e2e061bfed1c565c87838f9810dbea194c73f64c61dc05be1e3da6c73740c
 SHA512:
-  metadata.gz: 7dc6c1849cce484b599b8677c46d0e408239f72144996359adeb00ffba106566d7e191d11ce2c5c5e5e543091a6ef9fefabe975e5ed1b7a029bae54c222d0cde
-  data.tar.gz: 55a468fd98862061b4d5d40492cc56cf4ffe712626fb1d4e0325d3db8744bdb097358e151b3d80b259eb804a96807c9ed61ed57dea85c6cdf16891b3787d8e2f
+  metadata.gz: 6c8598105fca1aa04c40df75a460115e94a6baf6731dc5d558e8cc3228e1f2e4894b085f0352f35bf3bcd11b0058007cdf7532044705903850729061fa1a87e7
+  data.tar.gz: b470ce0c8eefd4833999ab0f115ed224fac078b7362428e398b244dfeec73beb2a31371dfc4a2c2b57e52c2c6acad0b421690dd1e0f32da41f2bef59e7307845

data/CHANGELOG.md

@@ -1,7 +1,33 @@
-## 2.4.4 (April 21, 2025)
+## 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:
 
+- communicator/none: Add experimental none communicator [GH-13651]
+
+BUG FIXES:
+
+- core/bundler: Handle multiple versions for system specifications [GH-13652]
+
+## 2.4.4 (April 21, 2025)
+
 IMPROVEMENTS:
 
 - communicator/ssh: Update connect retry behavior, make configurable [GH-13628]

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/bundler.rb

@@ -549,8 +549,10 @@ module Vagrant
         @logger.debug("Disabling strict dependency enforcement")
       end
 
-      @logger.debug("Dependency list for installation:\n - " \
-        "#{plugin_deps.map{|d| "#{d.name} #{d.requirement}"}.join("\n - ")}")
+      dep_list = plugin_deps.sort_by(&:name).map { |d|
+        "#{d.name} #{d.requirement}"
+      }.join("\n - ")
+      @logger.debug("Dependency list for installation:\n - #{dep_list}")
 
       all_sources = source_list.values.flatten.uniq
       default_sources = DEFAULT_GEM_SOURCES & all_sources
@@ -680,11 +682,11 @@ module Vagrant
       directories = [spec_dir]
       if Vagrant.in_bundler?
         Gem::Specification.find_all{true}.each do |spec|
-          list[spec.full_name] = spec
+          list[spec.name] = spec
         end
       else
         builtin_specs.each do |spec|
-          list[spec.full_name] = spec
+          list[spec.name] = spec
         end
       end
       if Vagrant.in_installer?
@@ -693,8 +695,8 @@ module Vagrant
         end
       end
       Gem::Specification.each_spec(directories) do |spec|
-        if !list[spec.full_name]
-          list[spec.full_name] = spec
+        if !list[spec.name] || list[spec.name].version < spec.version
+          list[spec.name] = spec
         end
       end
       list.values

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`"