From 7890320a7d95abc885ed48bc98c6ce7f9fd6f7ce Mon Sep 17 00:00:00 2001 From: Florent BEAUCHAMP Date: Tue, 20 Feb 2024 17:39:39 +0100 Subject: [PATCH] fix(xo-server/import): error during import of last snapshot of running VM (#7370) From zammad#21710 Introduced by 2d047c4fef356104ccbf51bffecc293c36b33beb --- CHANGELOG.unreleased.md | 1 + packages/xo-server/src/xo-mixins/migrate-vm.mjs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index c81500d61..a5e125a03 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -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 diff --git a/packages/xo-server/src/xo-mixins/migrate-vm.mjs b/packages/xo-server/src/xo-mixins/migrate-vm.mjs index d1a8690b3..3c90c3f07 100644 --- a/packages/xo-server/src/xo-mixins/migrate-vm.mjs +++ b/packages/xo-server/src/xo-mixins/migrate-vm.mjs @@ -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 } }) ) )