diff options
| author | Harald Hoyer <harald@hoyer.xyz> | 2017-07-28 09:46:05 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-07-28 03:46:05 -0400 |
| commit | 522aa9f5f8755d7389131da41bd60b6276917ff2 (patch) | |
| tree | 4de9046780ee1440feae241c2feb13528e9b9d36 /src | |
| parent | 36484c034163dad73fe7f45a6c7297c9ba8ff62a (diff) | |
| download | systemd-522aa9f5f8755d7389131da41bd60b6276917ff2.tar.gz | |
boot/efi: don't hard fail on error for tpm measure (#6473)
Display the error for a small amount of time, but don't fail hard.
In case of a faulty BIOS, a TPM error should not prevent the boot.
If something cares about the PCM measurement, it will be noticed
anyway later on.
Especially important now, that TPM measurement is the default now on
some distribution builds.
https://bugzilla.redhat.com/show_bug.cgi?id=1411156
Diffstat (limited to 'src')
| -rw-r--r-- | src/boot/efi/boot.c | 3 | ||||
| -rw-r--r-- | src/boot/efi/stub.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c index 9a02902428..21898837e0 100644 --- a/src/boot/efi/boot.c +++ b/src/boot/efi/boot.c @@ -1657,8 +1657,7 @@ static EFI_STATUS image_start(EFI_HANDLE parent_image, const Config *config, con loaded_image->LoadOptionsSize, loaded_image->LoadOptions); if (EFI_ERROR(err)) { Print(L"Unable to add image options measurement: %r", err); - uefi_call_wrapper(BS->Stall, 1, 3 * 1000 * 1000); - return err; + uefi_call_wrapper(BS->Stall, 1, 200 * 1000); } #endif } diff --git a/src/boot/efi/stub.c b/src/boot/efi/stub.c index bef416aa5c..7d03370cbd 100644 --- a/src/boot/efi/stub.c +++ b/src/boot/efi/stub.c @@ -94,8 +94,7 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) { loaded_image->LoadOptionsSize, loaded_image->LoadOptions); if (EFI_ERROR(err)) { Print(L"Unable to add image options measurement: %r", err); - uefi_call_wrapper(BS->Stall, 1, 3 * 1000 * 1000); - return err; + uefi_call_wrapper(BS->Stall, 1, 200 * 1000); } #endif } |