From a064e5117fea177cf5dbdd4443743eedfd9d4bcd Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 5 Oct 2021 18:35:25 +0200 Subject: [PATCH] efi: use vendor-agonstic "pre-enrolled-keys" + description fix Signed-off-by: Thomas Lamprecht --- PVE/QemuServer.pm | 2 +- PVE/QemuServer/Drive.pm | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 3c0ecf59..e5175b3f 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -3160,7 +3160,7 @@ sub get_ovmf_files($$) { my $type = 'default'; if (defined($efidisk->{efitype}) && $efidisk->{efitype} eq '4m') { - $type = $efidisk->{'ms-keys'} ? "4m-ms" : "4m"; + $type = $efidisk->{'pre-enrolled-keys'} ? "4m-ms" : "4m"; } return $types->{$type}->@*; diff --git a/PVE/QemuServer/Drive.pm b/PVE/QemuServer/Drive.pm index 57d26f59..ff184343 100644 --- a/PVE/QemuServer/Drive.pm +++ b/PVE/QemuServer/Drive.pm @@ -316,11 +316,11 @@ my %efitype_fmt = ( optional => 1, default => '2m', }, - 'ms-keys' => { + 'pre-enrolled-keys' => { type => 'boolean', - description => "Pre-enroll the Microsoft Standard UEFI Secure Boot keys if" - . " used with 'efitype=4m'. Note that this will enable Secure Boot by" - . " default, though it can still be turned off from within the VM.", + description => "Use am EFI vars template with distribution-specific and Microsoft Standard" + ." keys enrolled, if used with 'efitype=4m'. Note that this will enable Secure Boot by" + ." default, though it can still be turned off from within the VM.", optional => 1, default => 0, },