public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Luca Berneking <luca@berneking.net>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH qemu-server 1/1] pxe: Fix machine types with pxe
Date: Thu, 25 Mar 2021 19:12:03 +0100	[thread overview]
Message-ID: <20210325181203.1723609-2-luca@berneking.net> (raw)
In-Reply-To: <20210325181203.1723609-1-luca@berneking.net>

Fixes a problem with custom pxe roms.
I need to boot a custom ipxe rom image in my pve vms.
I simply replaced the rom file in `/usr/share/kvm/pxe-virtio.rom`
with my custom rom build.
But to actually load these rom images in a new vm, you need to use a
machine type with a ".pxe" suffix. Theres the problem, proxmox adds
"+pve0" to the machine type specified in the config, so
"pc-i440fx-5.0+pve0.pxe" became "pc-i440fx-5.0+pve0.pxe+pve0" which
obviously does not exists and failes to boot.

Signed-off-by: Luca Berneking <luca@berneking.net>
---
 PVE/QemuServer.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index a498444..85b9fc8 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -2872,7 +2872,7 @@ sub get_vm_machine {
 	}
     }
 
-    if ($add_pve_version && $machine !~ m/\+pve\d+$/) {
+    if ($add_pve_version && $machine !~ m/\+pve\d+(.pxe)?$/) {
 	# for version-pinned machines that do not include a pve-version (e.g.
 	# pc-q35-4.1), we assume 0 to keep them stable in case we bump
 	$machine .= '+pve0';
-- 
2.31.0




      reply	other threads:[~2021-03-25 18:17 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-25 18:12 [pve-devel] [PATCH qemu-server 0/1] " Luca Berneking
2021-03-25 18:12 ` Luca Berneking [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210325181203.1723609-2-luca@berneking.net \
    --to=luca@berneking.net \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal