Skip to content

Commit

Permalink
fix(xo-server/import): error during import of last snapshot of runnin…
Browse files Browse the repository at this point in the history
…g VM (#7370)

From zammad#21710

Introduced by 2d047c4
  • Loading branch information
fbeauchamp authored Feb 20, 2024
1 parent 1718649 commit 7890320
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
- [Settings/XO Config] Sort backups from newest to oldest
- [Plugins/audit] Don't log `tag.getAllConfigured` calls
- [Remotes] Correctly clear error when the remote is tested with success
- [Import/VMWare] Fix importing last snapshot (PR [#7370](https://github.com/vatesfr/xen-orchestra/pull/7370))

### Packages to release

Expand Down
2 changes: 1 addition & 1 deletion packages/xo-server/src/xo-mixins/migrate-vm.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ export default class MigrateVm {
const stream = vhd.stream()
await vdi.$importContent(stream, { format: VDI_FORMAT_VHD })
}
return vhd
return { vdi, vhd }
})
)
)
Expand Down

0 comments on commit 7890320

Please sign in to comment.