Skip to content

Commit 4c47e54

Browse files
jiangcuojiangcuo
committed
bump pve-manager to 8.3.3
1 parent 396e666 commit 4c47e54

6 files changed

Lines changed: 146 additions & 26 deletions

File tree

packages/pve-manager/patches/0013-Remove-incorrect-udev-rules.patch renamed to packages/pve-manager/patches/013-Remove-incorrect-udev-rules.patch

File renamed without changes.

‎packages/pve-manager/patches/014-fix-machine-select.patch‎

Lines changed: 109 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js
2+
index 2453fcf4..1d6a46fd 100644
3+
--- a/www/manager6/qemu/HardwareView.js
4+
+++ b/www/manager6/qemu/HardwareView.js
5+
@@ -165,11 +165,6 @@ Ext.define('PVE.qemu.HardwareView', {
6+
group: 6,
7+
defaultValue: '',
8+
renderer: function(value, metaData, record, rowIndex, colIndex, store, pending) {
9+
- let ostype = me.getObjectValue('ostype', undefined, pending);
10+
- if (PVE.Utils.is_windows(ostype) &&
11+
- (!value || value === 'pc' || value === 'q35')) {
12+
- return value === 'q35' ? 'pc-q35-5.1' : 'virt';
13+
- }
14+
return PVE.Utils.render_qemu_machine(value);
15+
},
16+
},
17+
diff --git a/www/manager6/qemu/MachineEdit.js b/www/manager6/qemu/MachineEdit.js
18+
index f8b3cb6a..d54ad01a 100644
19+
--- a/www/manager6/qemu/MachineEdit.js
20+
+++ b/www/manager6/qemu/MachineEdit.js
21+
@@ -9,6 +9,8 @@ Ext.define('PVE.qemu.MachineInputPanel', {
22+
},
23+
formulas: {
24+
q35: get => get('type') === 'q35',
25+
+ pc: get => get('type') === 'pc',
26+
+ virt: get => get('type') === 'virt',
27+
},
28+
},
29+
30+
@@ -23,24 +25,16 @@ Ext.define('PVE.qemu.MachineInputPanel', {
31+
let me = this;
32+
let version = me.lookup('version');
33+
let store = version.getStore();
34+
- let oldRec = store.findRecord('id', version.getValue(), 0, false, false, true);
35+
- let type = value === 'q35' ? 'q35' : 'default';
36+
- store.clearFilter();
37+
- store.addFilter(val => val.data.id === 'latest' || val.data.type === type);
38+
- if (!me.getView().isWindows) {
39+
- version.setValue('latest');
40+
- } else {
41+
- store.isWindows = true;
42+
- if (!oldRec) {
43+
- return;
44+
+ if (value === 'pc'){
45+
+ value = 'i440fx';
46+
}
47+
- let oldVers = oldRec.data.version;
48+
- // we already filtered by correct type, so just check version property
49+
- let rec = store.findRecord('version', oldVers, 0, false, false, true);
50+
- if (rec) {
51+
- version.select(rec);
52+
+ store.clearFilter();
53+
+ console.log('value is '+ value)
54+
+ if (value === null || value === '__default__') {
55+
+ store.addFilter(val => val.data.id === 'latest');
56+
+ }else{
57+
+ store.addFilter(val => val.data.id === 'latest' || val.data.type === value);
58+
}
59+
- }
60+
},
61+
},
62+
63+
@@ -68,28 +62,15 @@ Ext.define('PVE.qemu.MachineInputPanel', {
64+
let machineConf = PVE.Parser.parsePropertyString(values.machine, 'type');
65+
values.machine = machineConf.type;
66+
67+
- me.isWindows = values.isWindows;
68+
- if (values.machine === 'pc') {
69+
- values.machine = '__default__';
70+
- }
71+
-
72+
- if (me.isWindows) {
73+
- if (values.machine === '__default__') {
74+
- values.version = 'virt';
75+
- } else if (values.machine === 'q35') {
76+
- values.version = 'pc-q35-5.1';
77+
- }
78+
- }
79+
-
80+
values.viommu = machineConf.viommu || '__default__';
81+
82+
- if (values.machine !== '__default__' && values.machine !== 'q35') {
83+
- values.version = values.machine;
84+
- values.machine = values.version.match(/q35/) ? 'q35' : '__default__';
85+
+ // if (values.machine !== '__default__' && values.machine !== 'q35') {
86+
+ // values.version = values.machine;
87+
+ // values.machine = values.version.match(/q35/) ? 'q35' : '__default__';
88+
89+
- // avoid hiding a pinned version
90+
- me.setAdvancedVisible(true);
91+
- }
92+
+ // // avoid hiding a pinned version
93+
+ // me.setAdvancedVisible(true);
94+
+ // }
95+
96+
this.callParent(arguments);
97+
},
98+
@@ -131,9 +112,9 @@ Ext.define('PVE.qemu.MachineInputPanel', {
99+
},
100+
listeners: {
101+
load: function(records) {
102+
- if (!this.isWindows) {
103+
+
104+
this.insert(0, { id: 'latest', type: 'any', version: gettext('Latest') });
105+
- }
106+
+
107+
},
108+
},
109+
},

packages/pve-manager/patches/changelog/004-add-changelog-8.3.2+port.patch renamed to packages/pve-manager/patches/changelog/001-add-port-version.patch

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,37 @@
11
diff --git a/debian/changelog b/debian/changelog
2-
index f290c69e..782af9b6 100644
2+
index 545ec76e..1c4c21ba 100644
33
--- a/debian/changelog
44
+++ b/debian/changelog
5-
@@ -1,3 +1,9 @@
5+
@@ -6,6 +6,38 @@ pve-manager (8.3.3) bookworm; urgency=medium
6+
7+
-- Proxmox Support Team <support@proxmox.com> Mon, 20 Jan 2025 11:37:32 +0100
8+
9+
+pve-manager (8.3.2+port1) bookworm; urgency=medium
10+
+
11+
+ * ui: add arch select when vm create and edit
12+
+
13+
+ * api: add query machine info support
14+
+
15+
+ * ui: Add more compatibility
16+
+
17+
+ -- Jiangcuo <jiangcuo@lierfang.com> Sat, 18 Jan 2025 13:17:28 +0800
18+
+
19+
+pve-manager (8.3.2+port) bookworm; urgency=medium
20+
+
21+
+ * ui: ovmf as default bios
22+
+
23+
+ -- Jiangcuo <jiangcuo@lierfang.com> Fri, 27 Dec 2024 05:23:21 +0800
24+
+
25+
+pve-manager (8.3.2+port1) bookworm; urgency=medium
26+
+
27+
+ * ui: add arch select when vm create and edit
28+
+
29+
+ * api: add query machine info support
30+
+
31+
+ * ui: Add more compatibility
32+
+
33+
+ -- Jiangcuo <jiangcuo@lierfang.com> Sat, 18 Jan 2025 13:17:28 +0800
34+
+
635
+pve-manager (8.3.2+port) bookworm; urgency=medium
736
+
837
+ * ui: ovmf as default bios
@@ -12,7 +41,7 @@ index f290c69e..782af9b6 100644
1241
pve-manager (8.3.2) bookworm; urgency=medium
1342

1443
* api: network: add return schema for interface listing
15-
@@ -15,6 +21,12 @@ pve-manager (8.3.2) bookworm; urgency=medium
44+
@@ -23,6 +55,12 @@ pve-manager (8.3.2) bookworm; urgency=medium
1645

1746
-- Proxmox Support Team <support@proxmox.com> Mon, 16 Dec 2024 17:52:29 +0100
1847

@@ -25,7 +54,7 @@ index f290c69e..782af9b6 100644
2554
pve-manager (8.3.1) bookworm; urgency=medium
2655

2756
* ui: sdn firewall: add online help reference
28-
@@ -514,6 +526,14 @@ pve-manager (8.1.4) bookworm; urgency=medium
57+
@@ -522,6 +560,14 @@ pve-manager (8.1.4) bookworm; urgency=medium
2958

3059
-- Proxmox Support Team <support@proxmox.com> Thu, 14 Dec 2023 15:20:06 +0100
3160

‎packages/pve-manager/patches/changelog/013-add-changelog-8.3.2+port1.patch‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎packages/pve-manager/pve-manager‎

Submodule pve-manager updated from 883af41 to bbba1c5

‎packages/pve-manager/series‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ patches/007-remove-amd64-config.patch
66
patches/008-add-arm64-config.patch
77
patches/009-remove-other-ostype.patch
88
patches/010-set-architecture-to-any.patch
9-
patches/changelog/004-add-changelog-8.3.2+port.patch
9+
patches/changelog/001-add-port-version.patch
1010
patches/011-set-default-bios-type-to-OVMF.patch
1111
patches/012-Add-more-compatibility-for-hybrid-cluster.patch
12-
patches/0013-Remove-incorrect-udev-rules.patch
13-
patches/changelog/013-add-changelog-8.3.2+port1.patch
12+
patches/013-Remove-incorrect-udev-rules.patch
13+
patches/014-fix-machine-select.patch

0 commit comments

Comments
 (0)