diff --git a/tools/tools/nanobsd/embedded/common b/tools/tools/nanobsd/embedded/common index 013495997554..7186aa5ba4b5 100644 --- a/tools/tools/nanobsd/embedded/common +++ b/tools/tools/nanobsd/embedded/common @@ -297,7 +297,7 @@ create_diskimage_mbr ( ) ( # and p5 is alt-root (after resize) mkimg -a 2 ${fmtarg} ${bootmbr} -s gpt \ -p efi:=${NANO_WORLDDIR}/boot/efiboot.img \ - -p freebsd-boot:=${NAANO_WORLDDIR}/boot/gptboot \ + -p freebsd-boot:=${NANO_WORLDDIR}/boot/gptboot \ -p ${p3}:=${NANO_LOG}/_.p3 \ -p ${p4}:=${NANO_LOG}/_.p4 \ -o ${out}
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=5a9e5a5111af59dbc96383fcd73129e31648e017 commit 5a9e5a5111af59dbc96383fcd73129e31648e017 Author: Yann Kerherve <yannk@apple.com> AuthorDate: 2021-07-20 17:10:28 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2021-07-20 17:11:44 +0000 nanobsd: fix typo in NANO_WORLDDIR Reviewed by: imp PR: 257299 tools/tools/nanobsd/embedded/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Fixed, and queued to my local MFC eventually branches.
Which branches does this need to goto apart from 13? Are 12/11 also affected? ^Triage: Re-open pending merges
FreeBSD 11 nanobsd has diverged too much, and so I'm making no further commits at all to it since I can't test them properly and 11 is EOL soon.
Danke! I didn't change it here, but you can leave merge flags open ?, until merge, then + them ("done") and close :) - for 'not going to merge to this branch'
A commit in branch stable/13 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=2cbf9eff2d97a8e87f55928f6dbd8bcb1799e98d commit 2cbf9eff2d97a8e87f55928f6dbd8bcb1799e98d Author: Yann Kerherve <yannk@apple.com> AuthorDate: 2021-07-20 17:10:28 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2021-07-30 23:02:13 +0000 nanobsd: fix typo in NANO_WORLDDIR Reviewed by: imp PR: 257299 (cherry picked from commit 5a9e5a5111af59dbc96383fcd73129e31648e017) tools/tools/nanobsd/embedded/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
A commit in branch stable/12 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=c26dea4361aebff81ac8b1a7e0fac362d94216fa commit c26dea4361aebff81ac8b1a7e0fac362d94216fa Author: Yann Kerherve <yannk@apple.com> AuthorDate: 2021-07-20 17:10:28 +0000 Commit: Warner Losh <imp@FreeBSD.org> CommitDate: 2021-07-31 00:02:50 +0000 nanobsd: fix typo in NANO_WORLDDIR Reviewed by: imp PR: 257299 (cherry picked from commit 5a9e5a5111af59dbc96383fcd73129e31648e017) tools/tools/nanobsd/embedded/common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
^Triage: has been merged to all live branches.