Skip to content

Commit 9914d89

Browse files
committed
bootctl: ignore the bootloader boot entries
When bootctl lists the boot entries, considers also the ones returned by systemd-boot (via the efi LoaderEntries variable), created at boot time. Unfortunately this list may became incorrect if (e.g.) the user remove a kernel package. This patch changes this behaviour, so bootctl ignores some the boot entries returned by systemd-boot. In any case, bootctl still considers the 'auto-xxx' boot entries listed below: Boot entrie name Title ----------------------------- ------------------------------ auto-osx macOS boot loader auto-windows Windows Boot Manager auto-efi-shell EFI Shell auto-efi-default EFI Default Loader auto-reboot-to-firmware-setup Reboot Into Firmware Interface The other entries that systemd-boot synthetizes (e.g. the ones loaded from /efi/loader/entries/<uuid>) can be synthetized by bootctl too, so no information is lost. Signed-off-by: Goffredo Baroncelli <kreijack@inwind.it>
1 parent 8513c34 commit 9914d89

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/boot/bootctl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1603,7 +1603,7 @@ static int verb_list(int argc, char *argv[], void *userdata) {
16031603
else if (r < 0)
16041604
log_warning_errno(r, "Failed to determine entries reported by boot loader, ignoring: %m");
16051605
else
1606-
(void) boot_entries_augment_from_loader(&config, efi_entries, false);
1606+
(void) boot_entries_augment_from_loader(&config, efi_entries, true);
16071607

16081608
if (config.n_entries == 0)
16091609
log_info("No boot loader entries found.");

0 commit comments

Comments
 (0)