A list of valid ostypes for each architecture is defined in PVE.Utils, and this is used for the os type selector to only show relevant os types.
Use a setter for 'arch' so we can bind the values again in the wizard, similar to how the scsi selector is done. Also update 'me.nodename' in 'setNodename'. This was never necessary until now, but it is with the 'setArch' logic. Signed-off-by: Dominik Csapak <[email protected]> --- www/manager6/Utils.js | 23 ++++++++++++++++++ www/manager6/qemu/CreateWizard.js | 1 + www/manager6/qemu/OSTypeEdit.js | 39 ++++++++++++++++++++++++++++--- 3 files changed, 60 insertions(+), 3 deletions(-) diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js index d8b212bc..de1ee0ba 100644 --- a/www/manager6/Utils.js +++ b/www/manager6/Utils.js @@ -63,6 +63,17 @@ Ext.define('PVE.Utils', { Other: [{ desc: '-', val: 'other' }], }, + kvmOSTypesPerArchitecture: { + x86_64: { + bases: undefined, // include all + ostypes: undefined, // include all + }, + aarch64: { + bases: ['Linux', 'Other'], + ostypes: ['l26', 'other'], + }, + }, + is_windows: function (ostype) { for (let entry of PVE.Utils.kvm_ostypes['Microsoft Windows']) { if (entry.val === ostype) { @@ -2068,6 +2079,18 @@ Ext.define('PVE.Utils', { return Ext.htmlEncode(description); }, + // returns the resulting architecture from a given arch and + // the nodename, in case the architecture is set to default + getArchitecture: function (architecture, nodename) { + if (architecture === '__default__') { + architecture = undefined; + } + + let hostArchitecture = PVE.data.ResourceStore.getNodeById(nodename)?.data.architecture; + + return architecture ?? hostArchitecture ?? 'x86_64'; + }, + // returns if the given architecture is the native host architecture of the given nodename isHostArchitecture: function (architecture, nodename) { if (architecture === '__default__') { diff --git a/www/manager6/qemu/CreateWizard.js b/www/manager6/qemu/CreateWizard.js index d01c77e9..16bf6d9b 100644 --- a/www/manager6/qemu/CreateWizard.js +++ b/www/manager6/qemu/CreateWizard.js @@ -222,6 +222,7 @@ Ext.define('PVE.qemu.CreateWizard', { insideWizard: true, bind: { nodename: '{nodename}', + arch: '{current.architecture}', }, }, ], diff --git a/www/manager6/qemu/OSTypeEdit.js b/www/manager6/qemu/OSTypeEdit.js index f8f8c0b6..8c71f832 100644 --- a/www/manager6/qemu/OSTypeEdit.js +++ b/www/manager6/qemu/OSTypeEdit.js @@ -36,7 +36,11 @@ Ext.define('PVE.qemu.OSTypeInputPanel', { if (!me.getView().insideWizard) { return; } - var targetValues = PVE.qemu.OSDefaults.getDefaults(ostype); + let arch = PVE.Utils.getArchitecture( + me.getViewModel().get('current.architecture'), + me.nodename, + ); + var targetValues = PVE.qemu.OSDefaults.getDefaults(ostype, arch); me.setWidget('pveBusSelector', targetValues.busType); me.setWidget('pveNetworkCardSelector', targetValues.networkCard); @@ -77,17 +81,43 @@ Ext.define('PVE.qemu.OSTypeInputPanel', { updateVMConfig(); me.setWidget('pveBusSelector', 'scsi'); let ostype = me.lookup('ostype').getValue(); - let targetValues = PVE.qemu.OSDefaults.getDefaults(ostype); + let arch = PVE.Utils.getArchitecture( + me.getViewModel().get('current.architecture'), + me.nodename, + ); + let targetValues = PVE.qemu.OSDefaults.getDefaults(ostype, arch); me.setWidget('pveBusSelector', targetValues.busType); } }, }, setNodename: function (nodename) { - var me = this; + let me = this; + me.nodename = nodename; me.lookup('isoSelector').setNodename(nodename); }, + setArch: function (arch) { + let me = this; + + arch = PVE.Utils.getArchitecture(arch, me.nodename); + me.arch = arch; + + let osbaseStore = me.lookup('osbase').getStore(); + osbaseStore.clearFilter(); + let list = PVE.Utils.kvmOSTypesPerArchitecture[arch]?.bases; + if (list) { + osbaseStore.addFilter((rec) => list.indexOf(rec.data.field1) !== -1); + } + + let ostypeStore = me.lookup('ostype').getStore(); + ostypeStore.clearFilter(); + list = PVE.Utils.kvmOSTypesPerArchitecture[arch]?.ostypes; + if (list) { + ostypeStore.addFilter((rec) => list.indexOf(rec.data.val) !== -1); + } + }, + onGetValues: function (values) { if (values.ide0) { let drive = { @@ -112,6 +142,7 @@ Ext.define('PVE.qemu.OSTypeInputPanel', { xtype: 'combobox', submitValue: false, name: 'osbase', + reference: 'osbase', fieldLabel: gettext('Type'), editable: false, queryMode: 'local', @@ -196,6 +227,8 @@ Ext.define('PVE.qemu.OSTypeEdit', { var value = response.result.data.ostype || 'other'; var osinfo = PVE.Utils.get_kvm_osinfo(value); me.setValues({ ostype: value, osbase: osinfo.base }); + let arch = response.result.data.arch; + me.down('pveQemuOSTypePanel').setArch(arch); }, }); }, -- 2.47.3 _______________________________________________ pve-devel mailing list [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
