Page MenuHomeFreeBSD
Differential D28176

bsdinstall: create /EFI/BOOT directory in ESP
ClosedPublic
Actions

Authored by mhorne on Jan 15 2021, 4:18 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Nov 22, 10:23 PM
Unknown Object (File)
Wed, Nov 13, 10:44 PM
Unknown Object (File)
Tue, Nov 12, 8:23 AM
Unknown Object (File)
Oct 8 2024, 1:59 PM
Unknown Object (File)
Sep 28 2024, 5:35 AM
Unknown Object (File)
Sep 24 2024, 6:34 PM
Unknown Object (File)
Sep 15 2024, 10:06 PM
Unknown Object (File)
Sep 6 2024, 2:59 AM
View All 56 Files
Subscribers
None

Details

Reviewers
imp
bcran
Commits
rG676b7d077c2c: bsdinstall: create /efi/boot directory in ESP
Summary

If the installer is creating a new ESP, then this directory will not
exist and the subsequent cp will fail silently. This is usually of no
consequence if /EFI/freebsd/loader.efi is set up correctly.

Test Plan

bsdinstall to a blank disk, verify that /EFI/BOOT/BOOT${arch}.EFI is present on the ESP.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 36226
Build 33115: arc lint + arc unit

Event Timeline

mhorne requested review of this revision.Jan 15 2021, 4:18 PM
mhorne created this revision.
Harbormaster completed remote builds in B36226: Diff 82318.Jan 15 2021, 4:19 PM
mhorne added a comment.Jan 27 2021, 4:25 PM

Ping. Any objection to this patch?

imp added a comment.Jan 27 2021, 4:32 PM

The dirname got me thinking and that lead to these larger suggestions, as well as moving it earlier.

usr.sbin/bsdinstall/scripts/bootconfig
134

BOOTDIR="/efi/boot"
BOOTNAME="${BOOTDIR}/boot${ARCHBOOTNAME}.efi
FREEBSD_BOOTDIR="/efi/freebsd"

151

mkdir -p "${mntpt}/${FREEBSD_BOOTDIR}" "${mntpt}/${BOOTDIR}"

152

"${mntpt}/${FREEBSD_BOOTDIR}/loader.efi

166

This is too late. I'd suggest above.

mhorne added inline comments.Jan 27 2021, 4:40 PM
usr.sbin/bsdinstall/scripts/bootconfig
166

Yep, that is much better. Will update shortly.

mhorne updated this revision to Diff 82992.Jan 27 2021, 6:15 PM

Incorporate imp's suggestions.

Harbormaster completed remote builds in B36541: Diff 82992.Jan 27 2021, 6:15 PM
mhorne updated this revision to Diff 82993.Jan 27 2021, 6:25 PM

One further simplification, use $FREEBSD_BOOTNAME instead of $FREEBSD_BOOTDIR/loader.efi.

Harbormaster completed remote builds in B36542: Diff 82993.Jan 27 2021, 6:26 PM
imp accepted this revision.Jan 27 2021, 10:41 PM
This revision is now accepted and ready to land.Jan 27 2021, 10:41 PM
Closed by commit rG676b7d077c2c: bsdinstall: create /efi/boot directory in ESP (authored by mhorne). · Explain WhyJan 27 2021, 11:36 PM
This revision was automatically updated to reflect the committed changes.
mhorne added a commit: rG676b7d077c2c: bsdinstall: create /efi/boot directory in ESP.

Revision Contents
Changeset List

PathSize
usr.sbin/
bsdinstall/
scripts/
1 line

Diff 82318

View Options

usr.sbin/bsdinstall/scripts/bootconfig

Loading...