From ff84f0e36b6f2a476db1519739d1cd6a5c6ed8ac Mon Sep 17 00:00:00 2001 From: Fabian Ebner Date: Wed, 9 Mar 2022 11:09:10 +0100 Subject: [PATCH] efivars size: allow overriding efidisk parameter For disk import, it should be based on the disk properties that are passed in rather than on those of a possibly pre-existing disk in the config. Signed-off-by: Fabian Ebner --- PVE/QemuServer.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index b98ed3dc..b246602e 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -7703,9 +7703,10 @@ sub qemu_use_old_bios_files { } sub get_efivars_size { - my ($conf) = @_; + my ($conf, $efidisk) = @_; + my $arch = get_vm_arch($conf); - my $efidisk = $conf->{efidisk0} ? parse_drive('efidisk0', $conf->{efidisk0}) : undef; + $efidisk //= $conf->{efidisk0} ? parse_drive('efidisk0', $conf->{efidisk0}) : undef; my $smm = PVE::QemuServer::Machine::machine_type_is_q35($conf); my (undef, $ovmf_vars) = get_ovmf_files($arch, $efidisk, $smm); die "uefi vars image '$ovmf_vars' not found\n" if ! -f $ovmf_vars;