diff options
| author | Rebecca Cran <bcran@FreeBSD.org> | 2018-12-20 19:39:37 +0000 |
|---|---|---|
| committer | Rebecca Cran <bcran@FreeBSD.org> | 2018-12-20 19:39:37 +0000 |
| commit | db8b56134506840832bec2d1ce07b9e00d4d6d71 (patch) | |
| tree | 242e3d5aea577a1691fc784b6b35da9690e23d5c /release/amd64/make-memstick.sh | |
| parent | d5cee48f3e65662051e15c85e4fc1841d72977fe (diff) | |
| download | src-db8b56134506840832bec2d1ce07b9e00d4d6d71.tar.gz src-db8b56134506840832bec2d1ce07b9e00d4d6d71.zip | |
Rework UEFI ESP generation
Currently, the installer uses pre-created 800KB FAT12 filesystems that
it dd's onto the ESP partition.
This changeset improves that by having the installer generate a FAT32
filesystem directly onto the ESP using newfs_msdos and then copying
loader.efi into /EFI/freebsd.
For live installs it then runs efibootmgr to add a FreeBSD boot entry
in the BIOS.
Sponsored by: Netflix
Differential Revision: https://reviews.freebsd.org/D17947
Notes
Notes:
svn path=/head/; revision=342283
Diffstat (limited to 'release/amd64/make-memstick.sh')
| -rwxr-xr-x | release/amd64/make-memstick.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/release/amd64/make-memstick.sh b/release/amd64/make-memstick.sh index 3de8cb2a0b83..c0e405c3a976 100755 --- a/release/amd64/make-memstick.sh +++ b/release/amd64/make-memstick.sh @@ -12,6 +12,9 @@ set -e +scriptdir=$(dirname $(realpath $0)) +. ${scriptdir}/../../tools/boot/install-boot.sh + PATH=/bin:/usr/bin:/sbin:/usr/sbin export PATH @@ -36,11 +39,16 @@ makefs -B little -o label=FreeBSD_Install -o version=2 ${2}.part ${1} rm ${1}/etc/fstab rm ${1}/etc/rc.conf.local +# Make an ESP in a file. +espfilename=$(mktemp /tmp/efiboot.XXXXXX) +make_esp_file ${espfilename} ${fat32min} ${1}/boot/loader.efi + mkimg -s mbr \ -b ${1}/boot/mbr \ - -p efi:=${1}/boot/boot1.efifat \ + -p efi:=${espfilename} \ -p freebsd:-"mkimg -s bsd -b ${1}/boot/boot -p freebsd-ufs:=${2}.part" \ -a 2 \ -o ${2} +rm ${espfilename} rm ${2}.part |