vagrant 2.4.6 → 2.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0626c2a374eefa0d6beab52f299d0d1ecaf4855ae7f53dc1a29bc4bb3372fb97
-  data.tar.gz: d37e2e061bfed1c565c87838f9810dbea194c73f64c61dc05be1e3da6c73740c
+  metadata.gz: a92c20e5a3d39c9d5da86eb148a11f8217cf57c7f8a248efd9837f3b74266022
+  data.tar.gz: de063590a0b3d8704def63c7f96f17400094034c8819cb69cadf9f2a7ae5cb38
 SHA512:
-  metadata.gz: 6c8598105fca1aa04c40df75a460115e94a6baf6731dc5d558e8cc3228e1f2e4894b085f0352f35bf3bcd11b0058007cdf7532044705903850729061fa1a87e7
-  data.tar.gz: b470ce0c8eefd4833999ab0f115ed224fac078b7362428e398b244dfeec73beb2a31371dfc4a2c2b57e52c2c6acad0b421690dd1e0f32da41f2bef59e7307845
+  metadata.gz: fa7ce2d66db74feb9271cb3cfec80bddc763bb03941093735fe30e9f77b80fc06b21108bf3c7b57b5bfa5cb1176f4d444231d24124dc5141ffcd9cdb65cb567d
+  data.tar.gz: bda8216b65f5493b51e9e3578b7e3636b40b717c6ecdcfbe13bdf5f87ea8e41eaa220cdedefdb78baba6d64bffa3e6e0d8ed2e730f5cb320e0ae8c4f71b787e4

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 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/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,7 +333,11 @@ function New-VagrantVMXML {
 
     # Apply original VM configuration to new VM instance
 
-    $processors = $VMConfig.configuration.settings.processors.count."#text"
+    if($CPUCount -ne $null) {
+        $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") {
@@ -336,10 +346,22 @@ function New-VagrantVMXML {
     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) {
+        $MemoryMaximumBytes = $Memory * 1MB
+        $MemoryStartupBytes = $Memory * 1MB
+        $MemoryMinimumBytes = $Memory * 1MB
+    } else {
+        $MemoryMaximumBytes = ($memory.limit."#text" -as [int]) * 1MB
+        $MemoryStartupBytes = ($memory.size."#text" -as [int]) * 1MB
+        $MemoryMinimumBytes = ($memory.reservation."#text" -as [int]) * 1MB
+    }
+
+    if($MaxMemory -ne $null) {
+        $dynamicmemory = $true
+        $MemoryMaximumBytes = $MaxMemory * 1MB
+    }
 
     $Config = @{
         ProcessorCount = $processors;

data/version.txt

@@ -1 +1 @@
-2.4.6
+2.4.7

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant
 version: !ruby/object:Gem::Version
-  version: 2.4.6
+  version: 2.4.7
 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-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64