proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-14 22:53:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ui: qemu wizard: use better boot order for second cd drive

Browse Source 
in the case we add a second cd drive (for windows), we don't want the
backend logic to only include the first one, since we cannot know
which is bootable and which is (probably) the virtio iso.

so instead, emulate the backend logic for the wizard but include both cd
drives in that case, otherwise let the backend decide like before

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2023-11-21 09:35:51 +01:00 committed by Thomas Lamprecht
parent 5b2e8bd4d1
commit fc3a88ad0d
1 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
www/manager6/qemu/CreateWizard.js
View File

@ -26,6 +26,41 @@ Ext.define('PVE.qemu.CreateWizard', {
subject: gettext('Virtual Machine'),
// fot the special case that we have 2 cdrom drives
//
// emulates part of the backend bootorder logic, but includes all
// cdrom drives since we don't know which one the user put in a bootable iso
// and hardcodes the known values (ide0/2, net0)
calculateBootOrder: function(values) {
// user selected windows + second cdrom
if (values.ide0 && values.ide0.match(/media=cdrom/)) {
let disk;
PVE.Utils.forEachBus(['ide', 'scsi', 'virtio', 'sata'], (type, id) => {
let confId = type + id;
if (!values[confId]) {
return undefined;
}
if (values[confId].match(/media=cdrom/)) {
return undefined;
}
disk = confId;
return false; // abort loop
});
let order = [];
if (disk) {
order.push(disk);
}
order.push('ide0', 'ide2');
if (values.net0) {
order.push('net0');
}
return `order=${order.join(';')}`;
}
return undefined;
},
items: [
{
xtype: 'inputpanel',
@ -228,8 +263,15 @@ Ext.define('PVE.qemu.CreateWizard', {
],
listeners: {
show: function(panel) {
var kv = this.up('window').getValues();
let wizard = this.up('window');
var kv = wizard.getValues();
var data = [];
let boot = wizard.calculateBootOrder(kv);
if (boot) {
kv.boot = boot;
}
Ext.Object.each(kv, function(key, value) {
if (key === 'delete') { // ignore
return;
@ -254,6 +296,11 @@ Ext.define('PVE.qemu.CreateWizard', {
var nodename = kv.nodename;
delete kv.nodename;
let boot = wizard.calculateBootOrder(kv);
if (boot) {
kv.boot = boot;
}
Proxmox.Utils.API2Request({
url: '/nodes/' + nodename + '/qemu',
waitMsgTarget: wizard,