From nobody Thu Jan 29 15:39:55 2026 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f23HJ0vsmz6Qrlp for ; Thu, 29 Jan 2026 15:39:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f23HH4f9yz3xr6 for ; Thu, 29 Jan 2026 15:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769701195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DKf0AwwaArFisG1YsddFT4FzRywZCAukkBVzlXtfmH0=; b=Ao91PjJ0pWRfogNaw061WVvEw0fj/ka4YEWJMQbnsdnrWSlSi/DqzV3Wbqd3zu/bxUNoRP YZTnR0IahFJVxKVOjsb2e4xq3tJDwaRjI9R4XscLIM1+tdeeUTsEWWRMkRiox/cxuMldYU l7RjReTpj+Xp8vWyk1COotSgyHh2GsGCuBVXh9JWzsZIFfvw6rwSTftsgA0y0tfzq3kRJ4 KagCZOCM/wX/JsxlbAss1Ug16IgvBQqVaTKRRTjEWTqU+kNm/xWlmvu/XZ6iZaADTS7f53 Rz2QVvddQMBLDtLIEE/u8krXhxD35H4Y+gx1qM5LaXa1epX/E5PJs8zUVO0TPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769701195; a=rsa-sha256; cv=none; b=y1YO21tOIkYxB7gbLfmS2BtpilTPlqZotICb89N7T5o+kx4KGAZC4fIU58DTE8+EKF24j7 jcS73R/UhdcGx/B8/CcoRvDZWwZYaoeNj7nWPbz8JPGaBkMi04Y8HsO9mdA75V19gCzy8J t0OEfIq2WW0UjLgzzPSYEqOpqT4dE81AJTNrnez7UH+tFf554tEkWQmPg/Hg3vaffKZQiC zJ9Jv5HduecstLddWi94wzdcVp0oFBcp4xIj1BQw0kcI8uHKIU2U8JGf83l4YwtwhPR720 kJvHSYwZtsN/B9Yg4s/i680ptC5nHOuUepto1Tn65YR8KFMuZpHYo1iCdtjtHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769701195; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DKf0AwwaArFisG1YsddFT4FzRywZCAukkBVzlXtfmH0=; b=RRSzijwrJhZ+1QaHBdgBQBZD2krszqjOlkh+XL0eTylu5YGUQxVyWFltW2UiYyFEEP24aA brXbeQgbcJaPU4Y6DdpS2gqYFekL5+1n5BgcpGKi55UDaflKMrLZQN8Z9PrH75TQYILMgd Djz2pAsOlaPAh05/2lv2XiDVPrPA2Nv38I5udimZs2Qj2LLcqQShArC9qY5Dp9rrO6OAAM umNA11xUIvWVFUCAmFHVaLrPL4pMFLQY+XpLpg4yWuUxn0liaPhdFHxrog0WFHaqEmsrkj cRfeEMv4m7f+lZGwISoHuQVS3rocBO8VmurMEB57Fw2ihW9AfhU4sooB2FE0Xw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f23HH4BCJzkvy for ; Thu, 29 Jan 2026 15:39:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 37e7a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 29 Jan 2026 15:39:55 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: fa8f3d3053b6 - stable/14 - tools/boot/rootgen: Remove stray zfsboot1 from ZFS + MBR + UEFI function List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: fa8f3d3053b6d84b284ca31296d276773a1de88c Auto-Submitted: auto-generated Date: Thu, 29 Jan 2026 15:39:55 +0000 Message-Id: <697b7f4b.37e7a.34a3a30b@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=fa8f3d3053b6d84b284ca31296d276773a1de88c commit fa8f3d3053b6d84b284ca31296d276773a1de88c Author: John Baldwin AuthorDate: 2025-07-28 14:55:07 +0000 Commit: John Baldwin 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} }