]> git.proxmox.com Git - qemu-server.git/commit - PVE/QemuServer.pm
cfg2cmd: fix +pveN machine types with pxe
authorStefan Reiter <s.reiter@proxmox.com>
Wed, 31 Mar 2021 14:39:23 +0000 (16:39 +0200)
committerThomas Lamprecht <t.lamprecht@proxmox.com>
Sun, 18 Apr 2021 15:58:56 +0000 (17:58 +0200)
commitd4be7f31b5f313d3e00944624963736b016a74e8
treeea969deefbdce397c0526301d62fc64551813caf
parenta0d8d8592aae4c3a20155f1504a194bff8f95061
cfg2cmd: fix +pveN machine types with pxe

Pinned machine versions like "pc-i440fx-4.2+pve2.pxe" would otherwise
get a second "+pve0" suffix, which is incorrect.

Also deal with non-pve pinned versions correctly, i.e.
"pc-i440fx-5.2.pxe" becomes "pc-i440fx-5.2+pve0.pxe".

Handle .pxe suffixes in Machine.pm as well, and add two test cases.

Co-developed-by: Luca Berneking <luca@berneking.net>
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
PVE/QemuServer.pm
PVE/QemuServer/Machine.pm
test/cfg2cmd/pinned-version-pxe-pve.conf [new file with mode: 0644]
test/cfg2cmd/pinned-version-pxe-pve.conf.cmd [new file with mode: 0644]
test/cfg2cmd/pinned-version-pxe.conf [new file with mode: 0644]
test/cfg2cmd/pinned-version-pxe.conf.cmd [new file with mode: 0644]