From 512b96af2425d549ebce3b2a6d6b833f401a4f5c Mon Sep 17 00:00:00 2001 From: Florent Beauchamp Date: Fri, 12 Aug 2022 16:07:44 +0200 Subject: [PATCH] fix(backups/cleanVm): fix path of merge state Introduced by ad149740b1f4a5e6214e25aa8478eb668c3875a5 --- @xen-orchestra/backups/_cleanVm.js | 2 +- CHANGELOG.unreleased.md | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/@xen-orchestra/backups/_cleanVm.js b/@xen-orchestra/backups/_cleanVm.js index 4019b7ee6..960781743 100644 --- a/@xen-orchestra/backups/_cleanVm.js +++ b/@xen-orchestra/backups/_cleanVm.js @@ -94,7 +94,7 @@ const listVhds = async (handler, vmDir, logWarn) => { vhds.add(`${vdiDir}/${file}`) } else { try { - const mergeState = JSON.parse(await handler.readFile(file)) + const mergeState = JSON.parse(await handler.readFile(`${vdiDir}/${file}`)) interruptedVhds.set(`${vdiDir}/${res[1]}`, { statePath: `${vdiDir}/${file}`, chain: mergeState.chain, diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index 5ed9733f2..4fe56e763 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -30,6 +30,7 @@ +- @xen-orchestra/backups patch - @xen-orchestra/fs major - vhd-lib major - xo-server minor