efi: use vendor-agonstic "pre-enrolled-keys" + description fix

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-10-05 18:35:25 +02:00
parent 6881de41a4
commit a064e5117f
2 changed files with 5 additions and 5 deletions

View File

@ -3160,7 +3160,7 @@ sub get_ovmf_files($$) {
my $type = 'default'; my $type = 'default';
if (defined($efidisk->{efitype}) && $efidisk->{efitype} eq '4m') { 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}->@*; return $types->{$type}->@*;

View File

@ -316,10 +316,10 @@ my %efitype_fmt = (
optional => 1, optional => 1,
default => '2m', default => '2m',
}, },
'ms-keys' => { 'pre-enrolled-keys' => {
type => 'boolean', type => 'boolean',
description => "Pre-enroll the Microsoft Standard UEFI Secure Boot keys if" description => "Use am EFI vars template with distribution-specific and Microsoft Standard"
. " used with 'efitype=4m'. Note that this will enable Secure Boot by" ." 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.", ." default, though it can still be turned off from within the VM.",
optional => 1, optional => 1,
default => 0, default => 0,