vagrant 2.4.6 → 2.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0626c2a374eefa0d6beab52f299d0d1ecaf4855ae7f53dc1a29bc4bb3372fb97
-  data.tar.gz: d37e2e061bfed1c565c87838f9810dbea194c73f64c61dc05be1e3da6c73740c
+  metadata.gz: f19af437fb31a0585525e07e85ce91a5228f36e18d8b2eebf8ee1741f3b7a0c3
+  data.tar.gz: 3baa2535360dac9edde5b875852e8288bbff83f6cd690ddd0faa08040f13f8cc
 SHA512:
-  metadata.gz: 6c8598105fca1aa04c40df75a460115e94a6baf6731dc5d558e8cc3228e1f2e4894b085f0352f35bf3bcd11b0058007cdf7532044705903850729061fa1a87e7
-  data.tar.gz: b470ce0c8eefd4833999ab0f115ed224fac078b7362428e398b244dfeec73beb2a31371dfc4a2c2b57e52c2c6acad0b421690dd1e0f32da41f2bef59e7307845
+  metadata.gz: 104b578f8065c53dd04b9896b745deec55f3b4fd31ae15f960c79be9392871082ce48c2e4e354977f1349d042da51b852c42410c106dc7d8b3927bdb3829874d
+  data.tar.gz: 938479a8ef6fc6b425cb873ce8b561be0288dbd5cebbb3543d2c887ae97ea4df68159540ada26ced866d9728419bf9c3266cd5a8d61c07e1f8cfb3c56fb8d333

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## 2.4.8 (August 05, 2025)
+
+IMPROVEMENTS:
+
+- core: Improve error message when no matching provider is found for a box [GH-13693]
+- core: Improve error message on box add failures [GH-13687]
+
+BUG FIXES:
+
+- core: Fix box add action when adding a box directly from a file [GH-13699]
+- provider/hyperv: Fix XML configuration parsing logic, and add additional checks for minimum amount of memory and CPU [GH-13691]
+- core: Fix guest network configuration when more than one network interface is present [GH-13686]
+
+## 2.4.7 (June 17, 2025)
+
+BUG FIXES:
+
+- guests/linux: Fix /etc/fstab clean up behavior [GH-13681]
+- provider/docker: Fix auto generated container names [GH-13678]
+- provider/hyperv: Fix import for XML based configuration [GH-13674]
+
 ## 2.4.6 (May 21, 2025)
 
 IMPROVEMENTS:

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

@@ -192,7 +192,7 @@ module Vagrant
             env,
             checksum: env[:box_checksum],
             checksum_type: env[:box_checksum_type],
-            architecture: env[:architecture]
+            architecture: env[:box_architecture]
           )
         end
 

data/lib/vagrant/util/guest_networks.rb

@@ -16,14 +16,7 @@ module Vagrant
           net_configs = machine.config.vm.networks.find_all { |type, _| type.to_s.end_with?("_network") }.map(&:last)
 
           # Get IDs of currently configured devices
-          current_devs = Hash.new.tap do |cd|
-            comm.execute("nmcli -t c show") do |type, data|
-              if type == :stdout
-                _, id, _, dev = data.strip.split(":")
-                cd[dev] = id
-              end
-            end
-          end
+          current_devs = get_current_devices(comm)
 
           networks.each.with_index do |network, i|
             net_opts = (net_configs[i] || {}).merge(network)
@@ -101,6 +94,23 @@ module Vagrant
             end
           end
         end
+
+        # Get all network devices currently managed by NetworkManager.
+        # @param [Vagrant::Plugin::V2::Communicator] comm Guest communicator
+        # @return [Hash] A hash of current device names and their associated IDs.
+        def get_current_devices(comm)
+          {}.tap do |cd|
+            comm.execute("nmcli -t c show") do |type, data|
+              if type == :stdout
+                data.strip.lines.map(&:chomp).each do |line|
+                  next if line.strip.empty?
+                  _, id, _, dev = line.strip.split(':')
+                  cd[dev] = id
+                end
+              end
+            end
+          end
+        end
       end
     end
   end

data/plugins/guests/linux/cap/persist_mount_shared_folder.rb

@@ -64,9 +64,17 @@ module VagrantPlugins
           machine.communicate.test("test -f /etc/fstab")
         end
 
+        def self.contains_vagrant_data?(machine)
+          machine.communicate.test("grep '#VAGRANT-BEGIN' /etc/fstab")
+        end
+
         def self.remove_vagrant_managed_fstab(machine)
           if fstab_exists?(machine)
-            machine.communicate.sudo("sed -i '/\#VAGRANT-BEGIN/,/\#VAGRANT-END/d' /etc/fstab")
+            if contains_vagrant_data?(machine)
+                machine.communicate.sudo("sed -i '/\#VAGRANT-BEGIN/,/\#VAGRANT-END/d' /etc/fstab")
+            else
+                @@logger.info("no vagrant data in fstab file, carrying on")
+            end
           else
             @@logger.info("no fstab file found, carrying on")
           end

data/plugins/providers/docker/action/create.rb

@@ -91,9 +91,7 @@ module VagrantPlugins
         def create_params
           container_name = @provider_config.name
           if !container_name
-            container_name = "#{@env[:root_path].basename.to_s}_#{@machine.name}"
-            container_name.gsub!(/[^-a-z0-9_]/i, "")
-            container_name << "_#{Time.now.to_i}"
+            container_name = generate_container_name
           end
 
           image = @env[:create_image]
@@ -156,6 +154,15 @@ module VagrantPlugins
 
           result
         end
+
+        def generate_container_name
+          container_name = "#{@env[:root_path].basename.to_s}_#{@machine.name}"
+          # Remove leading -/_ and any non-alphanumeric, non-hyphen/underscore characters
+          container_name.gsub!(/\A[^a-zA-Z0-9]+|[^-a-z0-9_]/i, "")
+          container_name << "_#{Time.now.to_i}"
+          container_name
+        end
+
       end
     end
   end

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

@@ -224,6 +224,12 @@ function New-VagrantVMXML {
         [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
     )
@@ -327,19 +333,35 @@ function New-VagrantVMXML {
 
     # Apply original VM configuration to new VM instance
 
-    $processors = $VMConfig.configuration.settings.processors.count."#text"
+    if($CPUCount -ne $null -and $CPUCount -gt 0) {
+        $processors = $CPUCount
+    } else {
+        $processors = $VMConfig.configuration.settings.processors.count."#text"
+    }
     $notes = (Select-Xml -XML $VMConfig -XPath "//notes").node."#text"
-    $memory = (Select-Xml -XML $VMConfig -XPath "//memory").node.Bank
-    if ($memory.dynamic_memory_enabled."#text" -eq "True") {
+    $memoryNode = (Select-Xml -XML $VMConfig -XPath "//memory").node.bank
+    if ($memoryNode.dynamic_memory_enabled."#text" -eq "True") {
         $dynamicmemory = $True
     }
     else {
         $dynamicmemory = $False
     }
-    # Memory values need to be in bytes
-    $MemoryMaximumBytes = ($memory.limit."#text" -as [int]) * 1MB
-    $MemoryStartupBytes = ($memory.size."#text" -as [int]) * 1MB
-    $MemoryMinimumBytes = ($memory.reservation."#text" -as [int]) * 1MB
+
+
+    if($Memory -ne $null -and $Memory -gt 0) {
+        $MemoryMaximumBytes = $Memory * 1MB
+        $MemoryStartupBytes = $Memory * 1MB
+        $MemoryMinimumBytes = $Memory * 1MB
+    } else {
+        $MemoryMaximumBytes = ($memoryNode.limit."#text" -as [int]) * 1MB
+        $MemoryStartupBytes = ($memoryNode.size."#text" -as [int]) * 1MB
+        $MemoryMinimumBytes = ($memoryNode.reservation."#text" -as [int]) * 1MB
+    }
+
+    if($MaxMemory -ne $null -and $MaxMemory -gt 0) {
+        $dynamicmemory = $true
+        $MemoryMaximumBytes = $MaxMemory * 1MB
+    }
 
     $Config = @{
         ProcessorCount = $processors;

data/templates/locales/en.yml

@@ -504,7 +504,7 @@ en:
         provider. Double-check your requested provider to verify you didn't
         simply misspell it.
 
-        If you're adding a box from HashiCorp's Vagrant Cloud, make sure the box is
+        If you're adding a box from HashiCorp's Vagrant Public Registry, make sure the box is
         released.
 
         Name: %{name}
@@ -556,11 +556,10 @@ en:
         Constraints: %{constraints}
         Available versions: %{versions}
       box_add_short_not_found: |-
-        The box '%{name}' could not be found or
-        could not be accessed in the remote catalog. If this is a private
-        box on HashiCorp's Vagrant Cloud, please verify you're logged in via
-        `vagrant login`. Also, please double-check the name. The expanded
-        URL and error message are shown below:
+        The box '%{name}' could not be found or could not be accessed in the remote catalog. 
+        If this is a private box on the HashiCorp Vagrant Public Registry, please verify 
+        you're logged in via `vagrant cloud auth login`. Also, please double-check the name. 
+        The expanded URL and error message are shown below:
 
         URL: %{url}
         Error: %{error}

data/version.txt

@@ -1 +1 @@
-2.4.6
+2.4.8

metadata

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