From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <s.reiter@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 4FEEC74C22
for <pve-devel@lists.proxmox.com>; Mon, 11 Oct 2021 14:55:29 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 4C1D220D56
for <pve-devel@lists.proxmox.com>; Mon, 11 Oct 2021 14:55:29 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id 4A24320D42
for <pve-devel@lists.proxmox.com>; Mon, 11 Oct 2021 14:55:28 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 18AFD45D00
for <pve-devel@lists.proxmox.com>; Mon, 11 Oct 2021 14:55:28 +0200 (CEST)
From: Stefan Reiter <s.reiter@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Mon, 11 Oct 2021 14:55:20 +0200
Message-Id: <20211011125520.1124937-4-s.reiter@proxmox.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20211011125520.1124937-1-s.reiter@proxmox.com>
References: <20211011125520.1124937-1-s.reiter@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.514 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: [pve-devel] [PATCH manager 3/3] ui: add 'win11' ostype and set
defaults in wizard
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Mon, 11 Oct 2021 12:55:29 -0000
Windows 11 requires a TPM and secure boot, so try to auto-enable both.
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
---
www/manager6/Utils.js | 1 +
www/manager6/qemu/SystemEdit.js | 16 ++++++++++++++++
2 files changed, 17 insertions(+)
diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index ee92cd43..274d4db2 100644
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -43,6 +43,7 @@ Ext.define('PVE.Utils', {
{ desc: '2.4 Kernel', val: 'l24' },
],
'Microsoft Windows': [
+ { desc: '11/2022', val: 'win11' },
{ desc: '10/2016/2019', val: 'win10' },
{ desc: '8.x/2012/2012r2', val: 'win8' },
{ desc: '7/2008r2', val: 'win7' },
diff --git a/www/manager6/qemu/SystemEdit.js b/www/manager6/qemu/SystemEdit.js
index 8d178f06..f3e3fe9c 100644
--- a/www/manager6/qemu/SystemEdit.js
+++ b/www/manager6/qemu/SystemEdit.js
@@ -56,6 +56,20 @@ Ext.define('PVE.qemu.SystemInputPanel', {
'pveQemuBiosSelector': {
change: 'biosChange',
},
+ '#': {
+ afterrender: 'setMachine',
+ },
+ },
+
+ setMachine: function() {
+ let me = this;
+ let vm = this.getViewModel();
+ let ostype = vm.get('current.ostype');
+ if (ostype === 'win11') {
+ me.lookup('machine').setValue('q35');
+ me.lookup('bios').setValue('ovmf');
+ me.lookup('addtpmbox').setValue(true);
+ }
},
},
@@ -71,6 +85,7 @@ Ext.define('PVE.qemu.SystemInputPanel', {
{
xtype: 'proxmoxKVComboBox',
name: 'machine',
+ reference: 'machine',
value: '__default__',
fieldLabel: gettext('Machine'),
comboItems: [
@@ -81,6 +96,7 @@ Ext.define('PVE.qemu.SystemInputPanel', {
{
xtype: 'pveQemuBiosSelector',
name: 'bios',
+ reference: 'bios',
value: '__default__',
fieldLabel: 'BIOS',
},
--
2.30.2