Skip to content

Commit

Permalink
fix(xo-server): add mbr for cloud-init only for windows VM (#7050)
Browse files Browse the repository at this point in the history
Fixes zammad#16808
  • Loading branch information
fbeauchamp committed Sep 28, 2023
1 parent ce617e0 commit 988179a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGELOG.unreleased.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
> Users must be able to say: “I had this issue, happy to know it's fixed”
- [Backup/Mirror] Fix backup report not being sent (PR [#7049](https://github.com/vatesfr/xen-orchestra/pull/7049))
- [New VM] Only add MBR to cloud-init drive on Windows VMs to avoid booting issues (e.g. with Talos) (PR [#7050](https://github.com/vatesfr/xen-orchestra/pull/7050))

### Packages to release

Expand All @@ -30,5 +31,6 @@
<!--packages-start-->

- xo-server-backup-reports patch
- xo-server patch

<!--packages-end-->
5 changes: 4 additions & 1 deletion packages/xo-server/src/xapi/index.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -1328,7 +1328,10 @@ export default class Xapi extends XapiBase {
)
),
])
buffer = addMbr(buffer)
// only add the MBR for windows VM
if (vm.platform.viridian === 'true') {
buffer = addMbr(buffer)
}
const vdi = await this._getOrWaitObject(
await this.VDI_create({
name_label: 'XO CloudConfigDrive',
Expand Down

0 comments on commit 988179a

Please sign in to comment.