stand/loader.efi: read zfs bootonce attribute before checking currdev
ClosedPublic
Actions

Authored by glebius on Jun 2 2023, 5:22 AM.

Details

Reviewers

imp
tsoome
manu

Commits

rGe3e2681d0ec2: stand/loader.efi: read zfs bootonce attribute before checking currdev

Summary

First check if bootonce is configured and if it is, then change currdev
accordingly and after that do the sanity check. This fixes boot in a
situation when ZFS pool doesn't have the "bootfs" property, but has
bootonce attribute set. A strange, but legitimate case.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

glebius created this revision.Jun 2 2023, 5:22 AM

Herald added a reviewer: manu. · View Herald TranscriptJun 2 2023, 5:22 AM

Herald added subscribers: dab, bcran. · View Herald Transcript

glebius requested review of this revision.Jun 2 2023, 5:22 AM

Harbormaster completed remote builds in B51854: Diff 122746.Jun 2 2023, 5:22 AM

glebius added a child revision: D40389: stand/boot1.efi: use the bootonce dataset as root dataset.Jun 2 2023, 5:22 AM

tsoome accepted this revision.Jun 2 2023, 11:42 AM

This revision is now accepted and ready to land.Jun 2 2023, 11:42 AM

imp added inline comments.Jun 2 2023, 2:38 PM

stand/efi/loader/main.c
268	I'm not 100% sure this is completely right. If we wind up not using it, then this shouldn't be set. And if it's not sane, shouldn't we act as if it wasn't set at all?

glebius added inline comments.Jun 2 2023, 3:18 PM

stand/efi/loader/main.c
268	This doesn't change the current behavior. I agree that env should be unset if we fail to mount the specified bootonce, but that can be a separate change.