diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-10-31 09:21:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-31 09:21:13 +0100 |
| commit | 673d873a42fd6e7821e310cfb81bc37d092c4a22 (patch) | |
| tree | 5c5e4372775885533db8fa8aef1ddc52c6487623 /src/boot/efi/boot.c | |
| parent | 20bae8b94d34d75fe2572738e466abc37563bf88 (diff) | |
| parent | d9690d8fe9016783ef164c9a006e30987c359c6f (diff) | |
| download | systemd-673d873a42fd6e7821e310cfb81bc37d092c4a22.tar.gz | |
Merge pull request #13510 from medhefgo/boot
sd-boot: Be silent on regular boots
Diffstat (limited to 'src/boot/efi/boot.c')
| -rw-r--r-- | src/boot/efi/boot.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/boot/efi/boot.c b/src/boot/efi/boot.c index fd0c972951..fb7abd1f38 100644 --- a/src/boot/efi/boot.c +++ b/src/boot/efi/boot.c @@ -515,7 +515,6 @@ static BOOLEAN menu_run( BOOLEAN exit = FALSE; BOOLEAN run = TRUE; BOOLEAN wait = FALSE; - BOOLEAN cleared_screen = FALSE; graphics_mode(FALSE); uefi_call_wrapper(ST->ConIn->Reset, 2, ST->ConIn, FALSE); @@ -527,16 +526,13 @@ static BOOLEAN menu_run( if (config->console_mode_change != CONSOLE_MODE_KEEP) { err = console_set_mode(&config->console_mode, config->console_mode_change); - if (!EFI_ERROR(err)) - cleared_screen = TRUE; - } - - if (!cleared_screen) + if (EFI_ERROR(err)) { + uefi_call_wrapper(ST->ConOut->ClearScreen, 1, ST->ConOut); + Print(L"Error switching console mode to %ld: %r.\r", (UINT64)config->console_mode, err); + } + } else uefi_call_wrapper(ST->ConOut->ClearScreen, 1, ST->ConOut); - if (config->console_mode_change != CONSOLE_MODE_KEEP && EFI_ERROR(err)) - Print(L"Error switching console mode to %ld: %r.\r", (UINT64)config->console_mode, err); - err = uefi_call_wrapper(ST->ConOut->QueryMode, 4, ST->ConOut, ST->ConOut->Mode->Mode, &x_max, &y_max); if (EFI_ERROR(err)) { x_max = 80; |