Date: Thu, 29 Jan 2026 15:39:55 +0000 From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: fa8f3d3053b6 - stable/14 - tools/boot/rootgen: Remove stray zfsboot1 from ZFS + MBR + UEFI function Message-ID: <697b7f4b.37e7a.34a3a30b@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fa8f3d3053b6d84b284ca31296d276773a1de88c commit fa8f3d3053b6d84b284ca31296d276773a1de88c Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2025-07-28 14:55:07 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2026-01-29 15:20:36 +0000 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 (cherry picked from commit e958bc1c13377767d9b2cf87d072d923aa3d482a) --- tools/boot/rootgen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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} }home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?697b7f4b.37e7a.34a3a30b>