public/harvester-ui-extension
1
0
Fork 0
mirror of https://github.com/harvester/harvester-ui-extension.git synced 2026-08-17 21:29:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: A disk entry must be either disk or cdrom, never both (backport #998) (#1000)

Browse Source 
Related to: https://github.com/harvester/harvester/issues/11154


(cherry picked from commit 2cefd7cb78a1a8ec9c827a615a5a8e60a4edb4c0)

Signed-off-by: Volker Theile <vtheile@suse.com>
Co-authored-by: Volker Theile <vtheile@suse.com>
This commit is contained in:
mergify[bot] 2026-07-15 09:15:09 +02:00 committed by GitHub
parent 45f72749f5
commit b1387820ed
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/harvester/mixins/harvester-vm/index.js
View File

@ -1788,7 +1788,18 @@ export default {
const specDevice = specDeviceMap.get(device.name); const specDevice = specDeviceMap.get(device.name);
if (specDevice) { 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; return device;