mirror of
https://github.com/harvester/harvester-ui-extension.git
synced 2026-08-16 04:39:15 +00:00
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 <vtheile@suse.com>
This commit is contained in:
parent
fb6ffa3c0f
commit
2cefd7cb78
@ -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;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user