beckermj/vaguerent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Store backup disk location as local var

Browse Source
This commit is contained in:
Brian Cain 2020-02-12 09:56:41 -08:00
parent efde9595c4
commit d5e12dab17
No known key found for this signature in database
GPG Key ID: 9FC4639B2E4510A0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/providers/virtualbox/cap/configure_disks.rb
View File

@ -196,6 +196,7 @@ module VagrantPlugins
disk_info = machine.provider.driver.get_port_and_device(defined_disk["UUID"])
# original disk information in case anything goes wrong during clone/resize
original_disk = defined_disk
backup_disk_location = "#{original_disk["Location"]}.backup"
# clone disk to vdi formatted disk
vdi_disk_file = machine.provider.driver.vmdk_to_vdi(defined_disk["Location"])
@ -209,7 +210,7 @@ module VagrantPlugins
machine.provider.driver.remove_disk(disk_info[:port], disk_info[:device])
# Create a backup of the original disk if something goes wrong
LOGGER.warn("Making a backup of the original disk at #{defined_disk["Location"]}")
FileUtils.mv(defined_disk["Location"], "#{defined_disk["Location"]}.backup")
FileUtils.mv(defined_disk["Location"], backup_disk_location)
# we have to close here, otherwise we can't re-clone after
# resizing the vdi disk
@ -224,8 +225,7 @@ module VagrantPlugins
machine.ui.error("Vagrant has encountered an exception while trying to resize a disk. It will now attempt to reattach the original disk, as to prevent any data loss.")
machine.ui.error("The original disk is located at : #{original_disk["Location"]}")
# move backup to original name
FileUtils.mv("#{original_disk["Location"]}.backup",
original_disk["Location"], force: true)
FileUtils.mv(backup_disk_location, original_disk["Location"], force: true)
# Attach disk
machine.provider.driver.
attach_disk(disk_info[:port], disk_info[:device], original_disk["Location"], "hdd")
@ -238,7 +238,7 @@ module VagrantPlugins
raise e
ensure
# Remove backup disk file if all goes well
FileUtils.remove("#{original_disk["Location"]}.backup", force: true)
FileUtils.remove(backup_disk_location, force: true)
end
# Remove cloned resized volume format