diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2025-07-28 14:55:07 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2025-07-28 14:58:02 +0000 |
| commit | e958bc1c13377767d9b2cf87d072d923aa3d482a (patch) | |
| tree | b652d538c493d445cf5b0ec2692b93ad58abdd5f | |
| parent | 45c3fa9897f1fa9babe5b43bc4bf73eaf583e45a (diff) | |
tools/boot/rootgen: Remove stray zfsboot1 from ZFS + MBR + UEFI function
This was copy-pasted from the ZFS + MBF + BIOS function, but without
the corresponding code to extract zfsboot1 from /boot/zfsboot via
dd(1). It's also not necessary since UEFI booting doesn't make use of
BSD label boot blocks (note the lack of any -b option to mkimg when
generating the BSD partition in mk_nogeli_mbr_ufs_uefi()).
Reviewed by: imp, emaste
Differential Revision: https://reviews.freebsd.org/D51544
| -rwxr-xr-x | tools/boot/rootgen.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/boot/rootgen.sh b/tools/boot/rootgen.sh index d87eb481e2c1..32007a46802e 100755 --- a/tools/boot/rootgen.sh +++ b/tools/boot/rootgen.sh @@ -244,7 +244,7 @@ mk_nogeli_mbr_zfs_uefi() { makefs -t zfs -s 200m \ -o poolname=${pool} -o bootfs=${pool} -o rootpath=/ \ ${img}.s2a ${src} ${dst} - mkimg -s bsd -b ${dst}zfsboot1 -p freebsd-zfs:=${img}.s2a -o ${img}.s2 + mkimg -s bsd -p freebsd-zfs:=${img}.s2a -o ${img}.s2 mkimg -a 1 -s mbr -b ${src}/boot/mbr -p efi:=${img}.s1 -p freebsd:=${img}.s2 -o ${img} rm -rf ${dst} } |