Commit a3ddfb6
committed
composefs/status: Address review feedback on bootloader detection
Two follow-ups from review on #2376:
Reword the `BLS_ENTRIES_DIR` doc comment. It claimed the directory's
presence signals a non-EFI system using the BLS layout, which is
misleading: EFI systems have the directory too, and GRUB reads the same
Type 1 entries via `blscfg`. It only carries information in the non-EFI
branch, and only alongside the `GRUB_DIRS` probe.
Cache the bootloader unconditionally. The previous `if non_efi` gate was
added on the mistaken belief that unified caching broke the grub-cc
tests; those failures were pre-existing and tracked separately in #2378.
The bootloader cannot change over the lifetime of a single bootc
invocation, so there is no reason to re-read `EFI_LOADER_INFO` per call.
Signed-off-by: Dustin Kirkland <dustin.kirkland@chainguard.dev>1 parent bf1f012 commit a3ddfb6
1 file changed
Lines changed: 10 additions & 10 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
440 | 440 | | |
441 | 441 | | |
442 | 442 | | |
443 | | - | |
444 | | - | |
445 | | - | |
| 443 | + | |
| 444 | + | |
| 445 | + | |
| 446 | + | |
| 447 | + | |
| 448 | + | |
| 449 | + | |
446 | 450 | | |
447 | 451 | | |
448 | 452 | | |
| |||
522 | 526 | | |
523 | 527 | | |
524 | 528 | | |
525 | | - | |
526 | | - | |
527 | | - | |
528 | | - | |
529 | 529 | | |
530 | 530 | | |
531 | 531 | | |
| |||
539 | 539 | | |
540 | 540 | | |
541 | 541 | | |
542 | | - | |
543 | | - | |
544 | | - | |
| 542 | + | |
| 543 | + | |
| 544 | + | |
545 | 545 | | |
546 | 546 | | |
547 | 547 | | |
| |||
0 commit comments