1
0
mirror of https://github.com/systemd/systemd synced 2026-04-13 10:35:08 +02:00

Compare commits

..

2 Commits

Author SHA1 Message Date
Daan De Meyer
4d6455c075 journal: Don't discard -b arg when followed by -e
Allowing -e to be used to view the last logs of a previous boot seems
like a useful feature so let's not discard -b options anymore when
followed by -e.

Fixes #22107
2022-01-14 01:10:22 +09:00
Yu Watanabe
2ebb69bc09 boot: add missing error check
Follow-up for 661615a0afacee3545cde0a48286c0fef983f8fe.

Fixes CID#1468973.
2022-01-13 14:17:15 +01:00
2 changed files with 1 additions and 3 deletions

View File

@ -1978,7 +1978,7 @@ static EFI_STATUS boot_windows_bitlocker(void) {
continue; continue;
CHAR8 buf[block_io->Media->BlockSize]; CHAR8 buf[block_io->Media->BlockSize];
block_io->ReadBlocks(block_io, block_io->Media->MediaId, 0, sizeof(buf), buf); err = block_io->ReadBlocks(block_io, block_io->Media->MediaId, 0, sizeof(buf), buf);
if (EFI_ERROR(err)) if (EFI_ERROR(err))
continue; continue;

View File

@ -552,8 +552,6 @@ static int parse_argv(int argc, char *argv[]) {
arg_lines = 1000; arg_lines = 1000;
arg_boot = true; arg_boot = true;
arg_boot_id = SD_ID128_NULL;
arg_boot_offset = 0;
break; break;