From 2cefd7cb78a1a8ec9c827a615a5a8e60a4edb4c0 Mon Sep 17 00:00:00 2001 From: Volker Theile Date: Wed, 15 Jul 2026 09:11:58 +0200 Subject: [PATCH] fix: A disk entry must be either `disk` or `cdrom`, never both (#998) Related to: https://github.com/harvester/harvester/issues/11154 Signed-off-by: Volker Theile --- pkg/harvester/mixins/harvester-vm/index.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkg/harvester/mixins/harvester-vm/index.js b/pkg/harvester/mixins/harvester-vm/index.js index a6a575c1..87f240bd 100644 --- a/pkg/harvester/mixins/harvester-vm/index.js +++ b/pkg/harvester/mixins/harvester-vm/index.js @@ -1788,7 +1788,18 @@ export default { const specDevice = specDeviceMap.get(device.name); if (specDevice) { - return { ...specDevice, ...device }; + const merged = { ...specDevice, ...device }; + + // A disk entry must be either `disk` or `cdrom`, never both. + const type = device?.cdrom ? CD_ROM : device?.disk ? HARD_DISK : ''; + + if (type === CD_ROM) { + delete merged.disk; + } else if (type === HARD_DISK) { + delete merged.cdrom; + } + + return merged; } return device;