Skip to content

DO-NOT-MERGE: virtualbox/cap: fix path comparison for extra disks in snapshots(#13352) #13739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
brlin-tw wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −1
Draft

DO-NOT-MERGE: virtualbox/cap: fix path comparison for extra disks in snapshots(#13352) #13739

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion plugins/providers/virtualbox/cap/configure_disks.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,24 @@ def self.handle_configure_disk(machine, disk, controller_name)
# associated with the guest, since disk names are not unique
# globally to VirtualBox.
primary = storage_controllers.get_primary_attachment

# Determine candidate directories for the primary disk. When a VM
# has snapshots, VirtualBox may place snapshot differencing disks
# under a 'Snapshots' subdirectory while original disks live in the
# parent VM folder. For example:
# - /.../test_default_xxx/data.vdi
# - /.../test_default_xxx/Snapshots/{uuid}.vdi
# In that case, primary[:location] may point to the Snapshots path
# so we should also consider the parent directory when attempting
# to match existing extra disks by location.
primary_dir = File.dirname(primary[:location])
primary_dir_candidates = [primary_dir]
if File.basename(primary_dir) == "Snapshots"
primary_dir_candidates << File.dirname(primary_dir)
end

existing_disk = machine.provider.driver.list_hdds.detect do |d|
File.dirname(d["Location"]) == File.dirname(primary[:location]) &&
primary_dir_candidates.include?(File.dirname(d["Location"])) &&
d["Disk Name"] == disk.name
end

Expand Down
Loading